aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolay Borisov <nborisov@suse.com>2018-07-20 12:37:48 -0400
committerDavid Sterba <dsterba@suse.com>2018-08-06 07:12:57 -0400
commit68a9db5f2395cdef98b387bbb816604f6f298056 (patch)
tree93f785c28698285ed560ff722dccc52ab3e021b0
parent8e87e8562744e23e10afea98d610cc6b7f4ba9bb (diff)
btrfs: Remove fs_info from btrfs_rm_dev_replace_remove_srcdev
It can be referenced from the passed srcdev argument. Signed-off-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--fs/btrfs/dev-replace.c2
-rw-r--r--fs/btrfs/volumes.c5
-rw-r--r--fs/btrfs/volumes.h3
3 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index 059ca3d5ddd3..df375e1a0c9f 100644
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -667,7 +667,7 @@ static int btrfs_dev_replace_finishing(struct btrfs_fs_info *fs_info,
667 667
668 btrfs_rm_dev_replace_blocked(fs_info); 668 btrfs_rm_dev_replace_blocked(fs_info);
669 669
670 btrfs_rm_dev_replace_remove_srcdev(fs_info, src_device); 670 btrfs_rm_dev_replace_remove_srcdev(src_device);
671 671
672 btrfs_rm_dev_replace_unblocked(fs_info); 672 btrfs_rm_dev_replace_unblocked(fs_info);
673 673
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 1c88c4c947bb..d82658b01773 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1996,12 +1996,11 @@ error_undo:
1996 goto out; 1996 goto out;
1997} 1997}
1998 1998
1999void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_fs_info *fs_info, 1999void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_device *srcdev)
2000 struct btrfs_device *srcdev)
2001{ 2000{
2002 struct btrfs_fs_devices *fs_devices; 2001 struct btrfs_fs_devices *fs_devices;
2003 2002
2004 lockdep_assert_held(&fs_info->fs_devices->device_list_mutex); 2003 lockdep_assert_held(&srcdev->fs_info->fs_devices->device_list_mutex);
2005 2004
2006 /* 2005 /*
2007 * in case of fs with no seed, srcdev->fs_devices will point 2006 * in case of fs with no seed, srcdev->fs_devices will point
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 6943aab9bdd7..0ae45ff1961b 100644
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -452,8 +452,7 @@ void btrfs_init_devices_late(struct btrfs_fs_info *fs_info);
452int btrfs_init_dev_stats(struct btrfs_fs_info *fs_info); 452int btrfs_init_dev_stats(struct btrfs_fs_info *fs_info);
453int btrfs_run_dev_stats(struct btrfs_trans_handle *trans, 453int btrfs_run_dev_stats(struct btrfs_trans_handle *trans,
454 struct btrfs_fs_info *fs_info); 454 struct btrfs_fs_info *fs_info);
455void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_fs_info *fs_info, 455void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_device *srcdev);
456 struct btrfs_device *srcdev);
457void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info, 456void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info,
458 struct btrfs_device *srcdev); 457 struct btrfs_device *srcdev);
459void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info, 458void btrfs_destroy_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,