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: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index df375e1a0c9f2aa5244db7574af2cb321017f8f8..dd17a4d7bea2d19995a73fd4f33752f0ffe530d3 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -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++;

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index fc9d70a16d82a3058a432c56079077b695fecf18..9cd15964ab6f8f946aa6e2c19690f5ced34c5435 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -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);
 

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 0ae45ff1961b6276e4453b4f742d859ecfa7b777..1bcf0f34e8dcdb68eff6631052a518522b7478f1 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -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);