xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: drop devid as device_list_add() arg

Browse Source 
As struct btrfs_disk_super is being passed, so it can get devid
the same way its parent does.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain
2018-01-18 22:02:36 +08:00
committed by David Sterba
parent e124ece53e
commit 3acbcbfc8f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/btrfs/volumes.c
View File

@@ -728,12 +728,13 @@ error_brelse:
* error pointer when failed * error pointer when failed
*/ */
static noinline struct btrfs_device *device_list_add(const char *path, static noinline struct btrfs_device *device_list_add(const char *path,
struct btrfs_super_block *disk_super, u64 devid) struct btrfs_super_block *disk_super)
{ {
struct btrfs_device *device; struct btrfs_device *device;
struct btrfs_fs_devices *fs_devices; struct btrfs_fs_devices *fs_devices;
struct rcu_string *name; struct rcu_string *name;
u64 found_transid = btrfs_super_generation(disk_super); u64 found_transid = btrfs_super_generation(disk_super);
u64 devid = btrfs_stack_device_id(&disk_super->dev_item);
fs_devices = find_fsid(disk_super->fsid); fs_devices = find_fsid(disk_super->fsid);
if (!fs_devices) { if (!fs_devices) {
@@ -1181,7 +1182,6 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
struct block_device *bdev; struct block_device *bdev;
struct page *page; struct page *page;
int ret = 0; int ret = 0;
u64 devid;
u64 bytenr; u64 bytenr;
/* /*
@@ -1205,9 +1205,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
goto error_bdev_put; goto error_bdev_put;
} }
devid = btrfs_stack_device_id(&disk_super->dev_item); device = device_list_add(path, disk_super);
device = device_list_add(path, disk_super, devid);
if (IS_ERR(device)) if (IS_ERR(device))
ret = PTR_ERR(device); ret = PTR_ERR(device);
else else