diff options
| author |   Gu Jinxiang <gujx@cn.fujitsu.com> | 2018-07-12 14:23:16 +0800 |
|---|---|---|
| committer |   David Sterba <dsterba@suse.com> | 2018-08-06 13:12:48 +0200 |
| commit | 36350e95a2b1feed6382fe38cc80f79ec35a1323 (patch) | |
| tree | 251ce4ef0286301593c2ca0e16e04de144368697 /fs/btrfs/volumes.h | |
| parent | btrfs: make fs_devices a local variable in btrfs_parse_early_options (diff) | |
| download | linux-dev-36350e95a2b1feed6382fe38cc80f79ec35a1323.tar.xz linux-dev-36350e95a2b1feed6382fe38cc80f79ec35a1323.zip | |
btrfs: return device pointer from btrfs_scan_one_device
Return device pointer (with the IS_ERR semantics) from
btrfs_scan_one_device so we don't have to return in through pointer.
And since btrfs_fs_devices can be obtained from btrfs_device, return that.
Signed-off-by: Gu Jinxiang <gujx@cn.fujitsu.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
[ fixed conflics after recent changes to btrfs_scan_one_device ]
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 9665b84b1026..06d8bb7dd557 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -403,8 +403,8 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio, int mirror_num, int async_submit); int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, fmode_t flags, void *holder); -int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, - struct btrfs_fs_devices **fs_devices_ret); +struct btrfs_device *btrfs_scan_one_device(const char *path, + fmode_t flags, void *holder); 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_fs_info *fs_info, |