cleanup couple of device-related functions' retval
cover cleanup couple of device-related functions' retval
Currently btrfs_find_device_by_path, btrfs_find_device_missing_or_by_path and btrfs_find_device_by_devspec are called in a chain and they all return an integer value to signal error and at the same time use one of their parameters as an output. This patch set refactors those functions starting from the bottom, gradually making them return a pointer to btrfs_device. This is sufficient to convey an error when it occurs as well as return the actual device we are looking for. One added benefit is that the ioctl-specific positive return value BTRFS_ERROR_DEV_MISSING_NOT_FOUND is now returned from btrfs_rm_device rather than from some internal function.
Additionally I'll be sending a patch to progs, adding a test ensuring that BTRFS_ERROR_MISSING_NOT_FOUND is returned appropriately.
This survived both my btrfs-progs test as well as xfstest run. No functional changes.
Nikolay Borisov (3):
btrfs: Make btrfs_find_device_by_path return struct btrfs_device
btrfs: Make btrfs_find_device_missing_or_by_path return directly a
device
btrfs: Make btrfs_find_device_by_devspec return btrfs_device directly
fs/btrfs/dev-replace.c | 8 ++--- fs/btrfs/volumes.c | 73 ++++++++++++++++++++++-------------------- fs/btrfs/volumes.h | 9 ++---- 3 files changed, 45 insertions(+), 45 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/3 btrfs: Make btrfs_find_device_by_path return struct btrfs_device
Currently this function returns an error code as well as uses one of its arguments as a return value for struct btrfs_device. Change the function so that it returns btrfs_device directly and use the usual "encode error in pointer" mechanics if something goes wrong. No functional changes.
--- fs/btrfs/volumes.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)
fs/btrfs/volumes.c +14 -12
@@ -2096,9 +2096,9 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev)call_rcu (&tgtdev->rcu, free_device_rcu); } -static int btrfs_find_device_by_path (struct btrfs_fs_info *fs_info, -const char *device_path, -struct btrfs_device **device) +static struct btrfs_device * +btrfs_find_device_by_path (struct btrfs_fs_info *fs_info, +const char *device_path) {int ret =0 ;struct btrfs_super_block *disk_super;
@@ -2106,21 +2106,21 @@ static int btrfs_find_device_by_path(struct btrfs_fs_info *fs_info,u8 *dev_uuid;struct block_device *bdev;struct buffer_head *bh; +struct btrfs_device *device; - *device =NULL ; ret =btrfs_get_bdev_and_sb (device_path,FMODE_READ , fs_info->bdev_holder,0 , &bdev, &bh);if (ret) -return ret; +return ERR_PTR (ret); disk_super = (struct btrfs_super_block *)bh->b_data; devid =btrfs_stack_device_id (&disk_super->dev_item); dev_uuid = disk_super->dev_item.uuid; - *device =btrfs_find_device (fs_info, devid, dev_uuid, disk_super->fsid); + device =btrfs_find_device (fs_info, devid, dev_uuid, disk_super->fsid);brelse (bh); -if (!*device) - ret = -ENOENT ; +if (!device) + device =ERR_PTR (-ENOENT );blkdev_put (bdev,FMODE_READ ); -return ret; +return device; } int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,
@@ -2143,11 +2143,13 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,if (!*device)return BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; - -return 0 ; }else { -return btrfs_find_device_by_path (fs_info, device_path, device); + *device =btrfs_find_device_by_path (fs_info, device_path); +if (IS_ERR (*device)) +return PTR_ERR (*device); } + +return 0 ; }/*
Signature · 1 line
2.17.1
Re: [PATCH 1/3] btrfs: Make btrfs_find_device_by_path return struct btrfs_device
Quoted 7 lines · Nikolay Borisov
Currently this function returns an error code as well as uses one of its arguments as a return value for struct
btrfs_device. Change the function so that it returnsbtrfs_devicedirectly and use the usual "encode error in pointer" mechanics if something goes wrong. No functional changes.Signed-off-by Nikolay Borisov <[email protected]>
Thanks,
Qu
Quoted 67 lines
--- fs/btrfs/volumes.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)fs/btrfs/volumes.c +14
-12@@ -2096,9 +2096,9 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev)call_rcu (&tgtdev->rcu, free_device_rcu); } -static int btrfs_find_device_by_path (struct btrfs_fs_info *fs_info, -const char *device_path, -struct btrfs_device **device) +static struct btrfs_device * +btrfs_find_device_by_path (struct btrfs_fs_info *fs_info, +const char *device_path) {int ret =0 ;struct btrfs_super_block *disk_super;@@ -2106,21 +2106,21 @@ static int btrfs_find_device_by_path(struct btrfs_fs_info *fs_info,u8 *dev_uuid;struct block_device *bdev;struct buffer_head *bh; +struct btrfs_device *device; - *device =NULL ; ret =btrfs_get_bdev_and_sb (device_path,FMODE_READ , fs_info->bdev_holder,0 , &bdev, &bh);if (ret) -return ret; +return ERR_PTR (ret); disk_super = (struct btrfs_super_block *)bh->b_data; devid =btrfs_stack_device_id (&disk_super->dev_item); dev_uuid = disk_super->dev_item.uuid; - *device =btrfs_find_device (fs_info, devid, dev_uuid, disk_super->fsid); + device =btrfs_find_device (fs_info, devid, dev_uuid, disk_super->fsid);brelse (bh); -if (!*device) - ret = -ENOENT ; +if (!device) + device =ERR_PTR (-ENOENT );blkdev_put (bdev,FMODE_READ ); -return ret; +return device; } int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,@@ -2143,11 +2143,13 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,if (!*device)return BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; - -return 0 ; }else { -return btrfs_find_device_by_path (fs_info, device_path, device); + *device =btrfs_find_device_by_path (fs_info, device_path); +if (IS_ERR (*device)) +return PTR_ERR (*device); } + +return 0 ; }/*
Re: [PATCH 1/3] btrfs: Make btrfs_find_device_by_path return struct btrfs_device
In reply to Nikolay BorisovQuoted 16 lines · Nikolay Borisov
Currently this function returns an error code as well as uses one of its arguments as a return value for struct
btrfs_device. Change the function so that it returnsbtrfs_devicedirectly and use the usual "encode error in pointer" mechanics if something goes wrong. No functional changes.Signed-off-by Nikolay Borisov <[email protected]>--- fs/btrfs/volumes.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-)fs/btrfs/volumes.c +0
-0
fs/btrfs/volumes.c void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev) · line 2101
Quoted 9 lines
fs/btrfs/volumes.c +3
-3@@ -2096,9 +2096,9 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_device *tgtdev)call_rcu (&tgtdev->rcu, free_device_rcu); } -static int btrfs_find_device_by_path (struct btrfs_fs_info *fs_info, -const char *device_path, -struct btrfs_device **device) +static struct btrfs_device * +btrfs_find_device_by_path (struct btrfs_fs_info *fs_info, +const char *device_path)
Please don't split the type and function name, I'm going to fix that in the remaining patches.
PATCH 2/3 btrfs: Make btrfs_find_device_missing_or_by_path return directly a device
In reply to Nikolay BorisovThis function returns a numeric error value and additionally the device found in one of its input parameters. Simplify this by making the function directly return a pointer to btrfs_device. Additionally adjust the caller to handle the case when we want to remove the 'missing' device and ENOENT is returned to return the expected positive error value, parsed by progs. Finally, unexport the function since it's not called outside of volume.c. No functional changes.
--- fs/btrfs/volumes.c | 33 ++++++++++++++++++--------------- fs/btrfs/volumes.h | 3 --- 2 files changed, 18 insertions(+), 18 deletions(-)
fs/btrfs/volumes.c +18 -15
@@ -2123,11 +2123,11 @@ btrfs_find_device_by_path(struct btrfs_fs_info *fs_info,return device; } -int btrfs_find_device_missing_or_by_path (struct btrfs_fs_info *fs_info, -const char *device_path, -struct btrfs_device **device) +static struct btrfs_device * +btrfs_find_device_missing_or_by_path (struct btrfs_fs_info *fs_info, +const char *device_path) { - *device =NULL ; +struct btrfs_device *device =NULL ;if (strcmp (device_path,"missing" ) ==0 ) {struct list_head *devices;struct btrfs_device *tmp;
@@ -2136,20 +2136,18 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,list_for_each_entry (tmp, devices, dev_list) {if (test_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &tmp->dev_state) && !tmp->bdev) { - *device = tmp; + device = tmp;break ; } } -if (!*device) -return BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; +if (!device) +return ERR_PTR (-ENOENT ); }else { - *device =btrfs_find_device_by_path (fs_info, device_path); -if (IS_ERR (*device)) -return PTR_ERR (*device); + device =btrfs_find_device_by_path (fs_info, device_path); } -return 0 ; +return device; }/*
@@ -2159,10 +2157,9 @@ int btrfs_find_device_by_devspec(struct btrfs_fs_info *fs_info, u64 devid,const char *devpath, struct btrfs_device **device) { - int ret; + int ret = 0;if (devid) { - ret =0 ; *device =btrfs_find_device (fs_info, devid,NULL ,NULL );if (!*device) ret = -ENOENT ;
@@ -2170,8 +2167,14 @@ int btrfs_find_device_by_devspec(struct btrfs_fs_info *fs_info, u64 devid,if (!devpath || !devpath[0 ])return -EINVAL ; - ret =btrfs_find_device_missing_or_by_path (fs_info, devpath, - device); + *device =btrfs_find_device_missing_or_by_path (fs_info, devpath); +if (IS_ERR (*device)) { +if (PTR_ERR (*device) == -ENOENT && +strcmp (devpath,"missing" ) ==0 ) + ret =BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; +else + ret =PTR_ERR (*device); + } }return ret; }
fs/btrfs/volumes.h +0 -3
@@ -410,9 +410,6 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);void btrfs_free_extra_devids (struct btrfs_fs_devices *fs_devices,int step);void btrfs_assign_next_active_device (struct btrfs_device *device,struct btrfs_device *this_dev); -int btrfs_find_device_missing_or_by_path (struct btrfs_fs_info *fs_info, -const char *device_path, -struct btrfs_device **device);int btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info,u64 devid,const char *devpath,struct btrfs_device **device);
Signature · 1 line
2.17.1
Re: [PATCH 2/3] btrfs: Make btrfs_find_device_missing_or_by_path return directly a device
Quoted 9 lines · Nikolay Borisov
This function returns a numeric error value and additionally the device found in one of its input parameters. Simplify this by making the function directly return a pointer to
btrfs_device. Additionally adjust the caller to handle the case when we want to remove the 'missing' device and ENOENT is returned to return the expected positive error value, parsed by progs. Finally, unexport the function since it's not called outside ofvolume.c. No functional changes.Signed-off-by Nikolay Borisov <[email protected]>
Just changed when BTRFS_ERROR_DEV_MISSING_NOT_FOUND is returned, and since btrfs_find_device_missing_or_by_path() is only called in btrfs_find_device_by_devspec(), there is indeed no functional change.
Thanks,
Qu
Quoted 95 lines
--- fs/btrfs/volumes.c | 33 ++++++++++++++++++--------------- fs/btrfs/volumes.h | 3 --- 2 files changed, 18 insertions(+), 18 deletions(-)fs/btrfs/volumes.c +18
-15@@ -2123,11 +2123,11 @@ btrfs_find_device_by_path(struct btrfs_fs_info *fs_info,return device; } -int btrfs_find_device_missing_or_by_path (struct btrfs_fs_info *fs_info, -const char *device_path, -struct btrfs_device **device) +static struct btrfs_device * +btrfs_find_device_missing_or_by_path (struct btrfs_fs_info *fs_info, +const char *device_path) { - *device =NULL ; +struct btrfs_device *device =NULL ;if (strcmp (device_path,"missing" ) ==0 ) {struct list_head *devices;struct btrfs_device *tmp;@@ -2136,20 +2136,18 @@ int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,list_for_each_entry (tmp, devices, dev_list) {if (test_bit (BTRFS_DEV_STATE_IN_FS_METADATA , &tmp->dev_state) && !tmp->bdev) { - *device = tmp; + device = tmp;break ; } } -if (!*device) -return BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; +if (!device) +return ERR_PTR (-ENOENT ); }else { - *device =btrfs_find_device_by_path (fs_info, device_path); -if (IS_ERR (*device)) -return PTR_ERR (*device); + device =btrfs_find_device_by_path (fs_info, device_path); } -return 0 ; +return device; }/* @@ -2159,10 +2157,9 @@ int btrfs_find_device_by_devspec(struct btrfs_fs_info *fs_info, u64 devid,const char *devpath, struct btrfs_device **device) { - int ret; + int ret = 0;if (devid) { - ret =0 ; *device =btrfs_find_device (fs_info, devid,NULL ,NULL );if (!*device) ret = -ENOENT ;@@ -2170,8 +2167,14 @@ int btrfs_find_device_by_devspec(struct btrfs_fs_info *fs_info, u64 devid,if (!devpath || !devpath[0 ])return -EINVAL ; - ret =btrfs_find_device_missing_or_by_path (fs_info, devpath, - device); + *device =btrfs_find_device_missing_or_by_path (fs_info, devpath); +if (IS_ERR (*device)) { +if (PTR_ERR (*device) == -ENOENT && +strcmp (devpath,"missing" ) ==0 ) + ret =BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; +else + ret =PTR_ERR (*device); + } }return ret; }fs/btrfs/volumes.h +0
-3@@ -410,9 +410,6 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);void btrfs_free_extra_devids (struct btrfs_fs_devices *fs_devices,int step);void btrfs_assign_next_active_device (struct btrfs_device *device,struct btrfs_device *this_dev); -int btrfs_find_device_missing_or_by_path (struct btrfs_fs_info *fs_info, -const char *device_path, -struct btrfs_device **device);int btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info,u64 devid,const char *devpath,struct btrfs_device **device);
PATCH 3/3 btrfs: Make btrfs_find_device_by_devspec return btrfs_device directly
In reply to Nikolay BorisovInstead of returning an error value and using one of the parameters for returning the actual object we are interested in just refactor the function to directly return btrfs_device *. Also bubble up the error handling for the special BTRFS_ERROR_DEV_MISSING_NOT_FOUND value into btrfs_rm_device. No functional changes.
--- fs/btrfs/dev-replace.c | 8 ++++---- fs/btrfs/volumes.c | 40 +++++++++++++++++++--------------------- fs/btrfs/volumes.h | 6 +++--- 3 files changed, 26 insertions(+), 28 deletions(-)
fs/btrfs/dev-replace.c +4 -4
@@ -409,10 +409,10 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,struct btrfs_device *tgt_device =NULL ;struct btrfs_device *src_device =NULL ; - ret =btrfs_find_device_by_devspec (fs_info, srcdevid, - srcdev_name, &src_device); -if (ret) -return ret; + src_device =btrfs_find_device_by_devspec (fs_info, srcdevid, + srcdev_name); +if (IS_ERR (src_device)) +return PTR_ERR (src_device); ret =btrfs_init_dev_replace_tgtdev (fs_info, tgtdev_name, src_device, &tgt_device);
fs/btrfs/volumes.c +19 -21
@@ -1877,10 +1877,16 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,if (ret) goto out; - ret =btrfs_find_device_by_devspec (fs_info, devid, device_path, - &device); -if (ret) + device =btrfs_find_device_by_devspec (fs_info, devid, device_path); + +if (IS_ERR (device)) { +if (PTR_ERR (device) == -ENOENT && +strcmp (device_path,"missing" ) ==0 ) + ret =BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; +else + ret =PTR_ERR (device); goto out; + }if (test_bit (BTRFS_DEV_STATE_REPLACE_TGT , &device->dev_state)) { ret =BTRFS_ERROR_DEV_TGT_REPLACE ;
@@ -2153,30 +2159,22 @@ btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,/* * Lookup a device given by device id, or the path if the id is 0. */ -int btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info,u64 devid, -const char *devpath, -struct btrfs_device **device) +struct btrfs_device * +btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info,u64 devid, +const char *devpath) { -int ret =0 ; +struct btrfs_device *device;if (devid) { - *device =btrfs_find_device (fs_info, devid,NULL ,NULL ); -if (!*device) - ret = -ENOENT ; + device =btrfs_find_device (fs_info, devid,NULL ,NULL ); +if (!device) +return ERR_PTR (-ENOENT ); }else {if (!devpath || !devpath[0 ]) -return -EINVAL ; - - *device =btrfs_find_device_missing_or_by_path (fs_info, devpath); -if (IS_ERR (*device)) { -if (PTR_ERR (*device) == -ENOENT && -strcmp (devpath,"missing" ) ==0 ) - ret =BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; -else - ret =PTR_ERR (*device); - } +return ERR_PTR (-EINVAL ); + device =btrfs_find_device_missing_or_by_path (fs_info, devpath); } -return ret; +return device; }/*
fs/btrfs/volumes.h +3 -3
@@ -410,9 +410,9 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);void btrfs_free_extra_devids (struct btrfs_fs_devices *fs_devices,int step);void btrfs_assign_next_active_device (struct btrfs_device *device,struct btrfs_device *this_dev); -int btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info,u64 devid, -const char *devpath, -struct btrfs_device **device); +struct btrfs_device *btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info, +u64 devid, +const char *devpath);struct btrfs_device *btrfs_alloc_device (struct btrfs_fs_info *fs_info,const u64 *devid,const u8 *uuid);
Signature · 1 line
2.17.1
Re: [PATCH 3/3] btrfs: Make btrfs_find_device_by_devspec return btrfs_device directly
Quoted 7 lines · Nikolay Borisov
Instead of returning an error value and using one of the parameters for returning the actual object we are interested in just refactor the function to directly return
btrfs_device*. Also bubble up the error handling for the specialBTRFS_ERROR_DEV_MISSING_NOT_FOUNDvalue intobtrfs_rm_device. No functional changes.Signed-off-by Nikolay Borisov <[email protected]>
Thanks,
Qu
Quoted 108 lines
--- fs/btrfs/dev-replace.c | 8 ++++---- fs/btrfs/volumes.c | 40 +++++++++++++++++++--------------------- fs/btrfs/volumes.h | 6 +++--- 3 files changed, 26 insertions(+), 28 deletions(-)fs/btrfs/dev-replace.c +4
-4@@ -409,10 +409,10 @@ int btrfs_dev_replace_start(struct btrfs_fs_info *fs_info,struct btrfs_device *tgt_device =NULL ;struct btrfs_device *src_device =NULL ; - ret =btrfs_find_device_by_devspec (fs_info, srcdevid, - srcdev_name, &src_device); -if (ret) -return ret; + src_device =btrfs_find_device_by_devspec (fs_info, srcdevid, + srcdev_name); +if (IS_ERR (src_device)) +return PTR_ERR (src_device); ret =btrfs_init_dev_replace_tgtdev (fs_info, tgtdev_name, src_device, &tgt_device);fs/btrfs/volumes.c +19
-21@@ -1877,10 +1877,16 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,if (ret) goto out; - ret =btrfs_find_device_by_devspec (fs_info, devid, device_path, - &device); -if (ret) + device =btrfs_find_device_by_devspec (fs_info, devid, device_path); + +if (IS_ERR (device)) { +if (PTR_ERR (device) == -ENOENT && +strcmp (device_path,"missing" ) ==0 ) + ret =BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; +else + ret =PTR_ERR (device); goto out; + }if (test_bit (BTRFS_DEV_STATE_REPLACE_TGT , &device->dev_state)) { ret =BTRFS_ERROR_DEV_TGT_REPLACE ;@@ -2153,30 +2159,22 @@ btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,/* * Lookup a device given by device id, or the path if the id is 0. */ -int btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info,u64 devid, -const char *devpath, -struct btrfs_device **device) +struct btrfs_device * +btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info,u64 devid, +const char *devpath) { -int ret =0 ; +struct btrfs_device *device;if (devid) { - *device =btrfs_find_device (fs_info, devid,NULL ,NULL ); -if (!*device) - ret = -ENOENT ; + device =btrfs_find_device (fs_info, devid,NULL ,NULL ); +if (!device) +return ERR_PTR (-ENOENT ); }else {if (!devpath || !devpath[0 ]) -return -EINVAL ; - - *device =btrfs_find_device_missing_or_by_path (fs_info, devpath); -if (IS_ERR (*device)) { -if (PTR_ERR (*device) == -ENOENT && -strcmp (devpath,"missing" ) ==0 ) - ret =BTRFS_ERROR_DEV_MISSING_NOT_FOUND ; -else - ret =PTR_ERR (*device); - } +return ERR_PTR (-EINVAL ); + device =btrfs_find_device_missing_or_by_path (fs_info, devpath); } -return ret; +return device; }/* fs/btrfs/volumes.h +3
-3@@ -410,9 +410,9 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);void btrfs_free_extra_devids (struct btrfs_fs_devices *fs_devices,int step);void btrfs_assign_next_active_device (struct btrfs_device *device,struct btrfs_device *this_dev); -int btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info,u64 devid, -const char *devpath, -struct btrfs_device **device); +struct btrfs_device *btrfs_find_device_by_devspec (struct btrfs_fs_info *fs_info, +u64 devid, +const char *devpath);struct btrfs_device *btrfs_alloc_device (struct btrfs_fs_info *fs_info,const u64 *devid,const u8 *uuid);
PATCH 1/1 btrfs-progs: tests: Add test for missing device delete error value
In reply to Nikolay BorisovAdd a test which ensures the kernel returns the correct error value when missing device removal is requested. This test verifies that kernel refactoring didn't broken the return value.
--- tests/misc-tests/011-delete-missing-device/test.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
tests/misc-tests/011-delete-missing-device/test.sh +17 -0
@@ -44,6 +44,21 @@ test_delete_missing() run_check_umount_test_dev } +test_missing_error() +{ + run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV" + run_check_mount_test_dev + local out + out=$(run_mustfail_stdout "Unexpected success" \ + $SUDO_HELPER "$TOP/btrfs" device remove missing "$TEST_MNT") + + if ! echo "$out" | grep -q "no missing devices found to remove"; then + _fail "IOCTL returned unexpected error value" + fi + + run_check_umount_test_dev +} + setup_loopdevs 4 prepare_loopdevs dev1=${loopdevs[1]}
@@ -53,5 +68,7 @@ TEST_DEV=$dev1 test_do_mkfs -m raid1 -d raid1 test_wipefs test_delete_missing +test_missing_error + cleanup_loopdevs
Signature · 1 line
2.7.4
Re: [PATCH] btrfs-progs: tests: Add test for missing device delete error value
Quoted 14 lines · Nikolay Borisov
Add a test which ensures the kernel returns the correct error value when missing device removal is requested. This test verifies that kernel refactoring didn't broken the return value.
Signed-off-by Nikolay Borisov <[email protected]>--- tests/misc-tests/011-delete-missing-device/test.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)tests/misc-tests/011-delete-missing-device/test.sh +0
-0
tests/misc-tests/011-delete-missing-device/test.sh test_delete_missing() · line 52
Quoted 9 lines
tests/misc-tests/011-delete-missing-device/test.sh +6
-0@@ -44,6 +44,21 @@ test_delete_missing() run_check_umount_test_dev } +test_missing_error() +{ + run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV" + run_check_mount_test_dev + local out + out=$(run_mustfail_stdout "Unexpected success" \
Which would become:
unexpected success: Unexpected success
You'd win the error message of the year :) The text is supposed to be more specific what was not expected, eg. "missing device removed".
Re: [PATCH] btrfs-progs: tests: Add test for missing device delete error value
Quoted 27 lines · David Sterba
Quoted 14 lines · Nikolay Borisov
Add a test which ensures the kernel returns the correct error value when missing device removal is requested. This test verifies that kernel refactoring didn't broken the return value.
Signed-off-by Nikolay Borisov <[email protected]>--- tests/misc-tests/011-delete-missing-device/test.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)tests/misc-tests/011-delete-missing-device/test.sh +0
-0tests/misc-tests/011-delete-missing-device/test.sh test_delete_missing() · line 52
Quoted 9 lines
tests/misc-tests/011-delete-missing-device/test.sh +6
-0@@ -44,6 +44,21 @@ test_delete_missing() run_check_umount_test_dev } +test_missing_error() +{ + run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV" + run_check_mount_test_dev + local out + out=$(run_mustfail_stdout "Unexpected success" \Which would become:
Quoted 4 lines
unexpected success: Unexpected success
You'd win the error message of the year :) The text is supposed to be more specific what was not expected, eg. "missing device removed".
Updated and applied, thanks.
Quoted 17 lines · Nikolay Borisov
Currently
btrfs_find_device_by_path,btrfs_find_device_missing_or_by_pathandbtrfs_find_device_by_devspecare called in a chain and they all return an integer value to signal error and at the same time use one of their parameters as an output. This patch set refactors those functions starting from the bottom, gradually making them return a pointer tobtrfs_device. This is sufficient to convey an error when it occurs as well as return the actual device we are looking for. One added benefit is that the ioctl-specific positive return valueBTRFS_ERROR_DEV_MISSING_NOT_FOUNDis now returned frombtrfs_rm_devicerather than from some internal function.Additionally I'll be sending a patch to progs, adding a test ensuring that
BTRFS_ERROR_MISSING_NOT_FOUNDis returned appropriately.This survived both my btrfs-progs test as well as xfstest run. No functional changes.
Quoted 5 lines
Nikolay Borisov (3):
btrfs: Makebtrfs_find_device_by_pathreturn structbtrfs_device
btrfs: Makebtrfs_find_device_missing_or_by_pathreturn directly a
device
btrfs: Makebtrfs_find_device_by_devspecreturnbtrfs_devicedirectly
Added to misc-next, thanks.