btrfs: remove redundant btrfs_balance_control::fs_info

[sfrench/cifs-2.6.git] / fs / btrfs / volumes.c

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 45227c83b7427d230f62a67f146c12c52d73fa9a..ebc81766fc86eba60b3b63bbaa8b1bf4502879bc 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3769,10 +3769,10 @@ static inline int validate_convert_profile(struct btrfs_balance_args *bctl_arg,
 /*
  * Should be called with balance mutexe held
  */
 /*
  * Should be called with balance mutexe held
  */

-int btrfs_balance(struct btrfs_balance_control *bctl,
+int btrfs_balance(struct btrfs_fs_info *fs_info,
+                 struct btrfs_balance_control *bctl,

                  struct btrfs_ioctl_balance_args *bargs)
 {
                  struct btrfs_ioctl_balance_args *bargs)
 {

-       struct btrfs_fs_info *fs_info = bctl->fs_info;

        u64 meta_target, data_target;
        u64 allowed;
        int mixed = 0;
        u64 meta_target, data_target;
        u64 allowed;
        int mixed = 0;


@@ -3940,7 +3940,7 @@ static int balance_kthread(void *data)
        mutex_lock(&fs_info->balance_mutex);
        if (fs_info->balance_ctl) {
                btrfs_info(fs_info, "continuing balance");
        mutex_lock(&fs_info->balance_mutex);
        if (fs_info->balance_ctl) {
                btrfs_info(fs_info, "continuing balance");

-               ret = btrfs_balance(fs_info->balance_ctl, NULL);
+               ret = btrfs_balance(fs_info, fs_info->balance_ctl, NULL);

        }
        mutex_unlock(&fs_info->balance_mutex);
 
        }
        mutex_unlock(&fs_info->balance_mutex);
 


@@ -4011,7 +4011,6 @@ int btrfs_recover_balance(struct btrfs_fs_info *fs_info)
        leaf = path->nodes[0];
        item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_balance_item);
 
        leaf = path->nodes[0];
        item = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_balance_item);
 

-       bctl->fs_info = fs_info;

        bctl->flags = btrfs_balance_flags(leaf, item);
        bctl->flags |= BTRFS_BALANCE_RESUME;
 
        bctl->flags = btrfs_balance_flags(leaf, item);
        bctl->flags |= BTRFS_BALANCE_RESUME;