diff options
| author | David Sterba | 2018-05-07 17:44:03 +0200 |
|---|---|---|
| committer | David Sterba | 2018-05-28 18:07:30 +0200 |
| commit | 6fcf6e2bffb6cfe26f05795f4fba4e6bb6aa84bf (patch) | |
| tree | fbd966ec61b0201799eca513bcc64a81fb6f3309 /fs/btrfs/volumes.c | |
| parent | btrfs: qgroup: Allow trace_btrfs_qgroup_account_extent() to record its transid (diff) | |
| download | kernel-qcow2-linux-6fcf6e2bffb6cfe26f05795f4fba4e6bb6aa84bf.tar.gz kernel-qcow2-linux-6fcf6e2bffb6cfe26f05795f4fba4e6bb6aa84bf.tar.xz kernel-qcow2-linux-6fcf6e2bffb6cfe26f05795f4fba4e6bb6aa84bf.zip | |
btrfs: remove redundant btrfs_balance_control::fs_info
The fs_info is always available from the context so we don't need to
store it in the structure.
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 45227c83b742..ebc81766fc86 100644 --- 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 */ -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_fs_info *fs_info = bctl->fs_info; 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"); - ret = btrfs_balance(fs_info->balance_ctl, NULL); + ret = btrfs_balance(fs_info, fs_info->balance_ctl, NULL); } 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); - bctl->fs_info = fs_info; bctl->flags = btrfs_balance_flags(leaf, item); bctl->flags |= BTRFS_BALANCE_RESUME; |