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

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

btrfs: Remove fs_info from btrfs_rm_dev_replace_remove_srcdev 



It can be referenced from the passed srcdev argument.

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

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info, 


	btrfs_rm_dev_replace_blocked(fs_info);



	btrfs_rm_dev_replace_remove_srcdev(fs_info, src_device);

	btrfs_rm_dev_replace_remove_srcdev(src_device);



	btrfs_rm_dev_replace_unblocked(fs_info);

fs/btrfs/volumes.c

+2 −3
Original line number Diff line number Diff line
@@ -1996,12 +1996,11 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, 
	goto out;

}



void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_fs_info *fs_info,

					struct btrfs_device *srcdev)

void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_device *srcdev)

{

	struct btrfs_fs_devices *fs_devices;



	lockdep_assert_held(&fs_info->fs_devices->device_list_mutex);

	lockdep_assert_held(&srcdev->fs_info->fs_devices->device_list_mutex);



	/*

	 * in case of fs with no seed, srcdev->fs_devices will point

fs/btrfs/volumes.h

+1 −2
Original line number Diff line number Diff line
@@ -452,8 +452,7 @@ void btrfs_init_devices_late(struct btrfs_fs_info *fs_info); 
int btrfs_init_dev_stats(struct btrfs_fs_info *fs_info);

int btrfs_run_dev_stats(struct btrfs_trans_handle *trans,

			struct btrfs_fs_info *fs_info);

void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_fs_info *fs_info,

					struct btrfs_device *srcdev);

void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_device *srcdev);

void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info,

				      struct btrfs_device *srcdev);

void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,