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

Commit d6507cf1 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Remove fs_info from btrfs_assign_next_active_device 



It can be referenced from the passed 'device' argument which is always
a well-formed device.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 5495f195

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -658,7 +658,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 
	tgt_device->commit_total_bytes = src_device->commit_total_bytes;

	tgt_device->commit_bytes_used = src_device->bytes_used;



	btrfs_assign_next_active_device(fs_info, src_device, tgt_device);

	btrfs_assign_next_active_device(src_device, tgt_device);



	list_add(&tgt_device->dev_alloc_list, &fs_info->fs_devices->alloc_list);

	fs_info->fs_devices->rw_devices++;

fs/btrfs/volumes.c

+5 −4
Original line number Diff line number Diff line
@@ -1833,9 +1833,10 @@ static struct btrfs_device * btrfs_find_next_active_device( 
 * where this function called, there should be always be another device (or

 * this_dev) which is active.

 */

void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info,

		struct btrfs_device *device, struct btrfs_device *this_dev)

void btrfs_assign_next_active_device(struct btrfs_device *device,

				     struct btrfs_device *this_dev)

{

	struct btrfs_fs_info *fs_info = device->fs_info;

	struct btrfs_device *next_device;



	if (this_dev)
@@ -1945,7 +1946,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, 
	if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state))

		cur_devices->missing_devices--;



	btrfs_assign_next_active_device(fs_info, device, NULL);

	btrfs_assign_next_active_device(device, NULL);



	if (device->bdev) {

		cur_devices->open_devices--;
@@ -2077,7 +2078,7 @@ void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, 


	fs_devices->num_devices--;



	btrfs_assign_next_active_device(fs_info, tgtdev, NULL);

	btrfs_assign_next_active_device(tgtdev, NULL);



	list_del_rcu(&tgtdev->dev_list);

fs/btrfs/volumes.h

+2 −2
Original line number Diff line number Diff line
@@ -407,8 +407,8 @@ 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,

		struct btrfs_device *device, struct btrfs_device *this_dev);

void btrfs_assign_next_active_device(struct btrfs_device *device,

				     struct btrfs_device *this_dev);

int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,

					 const char *device_path,

					 struct btrfs_device **device);