diff options
| author |   Nikolay Borisov <nborisov@suse.com> | 2018-09-03 12:46:14 +0300 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2018-10-15 17:23:30 +0200 |
| commit | a27a94c2b0c727517c17cf2ca3a9f7291caadfbc (patch) | |
| tree | 4187cec66f66085176afed51436c29f71404b4b9 /fs/btrfs/dev-replace.c | |
| parent | btrfs: Make btrfs_find_device_missing_or_by_path return directly a device (diff) | |
| download | linux-dev-a27a94c2b0c727517c17cf2ca3a9f7291caadfbc.tar.xz linux-dev-a27a94c2b0c727517c17cf2ca3a9f7291caadfbc.zip | |
btrfs: Make btrfs_find_device_by_devspec return btrfs_device directly
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 special BTRFS_ERROR_DEV_MISSING_NOT_FOUND value into
btrfs_rm_device. No functional changes.
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index dec01970d8c5..4e2b67d06305 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c @@ -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); |