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/volumes.h | |
| 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/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index e7811473024d..aefce895e994 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -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); |