Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3acbcbfc authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: drop devid as device_list_add() arg 



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

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarJosef Bacik <jbacik@fb.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e124ece5

fs/btrfs/volumes.c

+3 −5
Original line number Diff line number Diff line
@@ -728,12 +728,13 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, 
 * error pointer when failed

 */

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_fs_devices *fs_devices;

	struct rcu_string *name;

	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);

	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 page *page;

	int ret = 0;

	u64 devid;

	u64 bytenr;



	/*
@@ -1205,9 +1205,7 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, 
		goto error_bdev_put;

	}



	devid = btrfs_stack_device_id(&disk_super->dev_item);



	device = device_list_add(path, disk_super, devid);

	device = device_list_add(path, disk_super);

	if (IS_ERR(device))

		ret = PTR_ERR(device);

	else