btrfs: qgroup: Drop fs_info parameter from btrfs_add_qgroup_relation

It can be fetched from the transaction handle.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 9dcd16dec754a920f997ddcdf7ca55295580a09f..70b6f943fd704a9ccc859c2fc314274796bd7c0e 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -5171,8 +5171,7 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)
        }
 
        if (sa->assign) {
-               ret = btrfs_add_qgroup_relation(trans, fs_info,
-                                               sa->src, sa->dst);
+               ret = btrfs_add_qgroup_relation(trans, sa->src, sa->dst);
        } else {
                ret = btrfs_del_qgroup_relation(trans, fs_info,
                                                sa->src, sa->dst);

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index a7890183f20f4f4420381e70ceda09a34e0514b4..8b71aec85d843b5979154b7e14c3e454073a4caf 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1236,9 +1236,10 @@ static int quick_update_accounting(struct btrfs_fs_info *fs_info,
        return ret;
 }
 
-int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,
-                             struct btrfs_fs_info *fs_info, u64 src, u64 dst)
+int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
+                             u64 dst)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        struct btrfs_root *quota_root;
        struct btrfs_qgroup *parent;
        struct btrfs_qgroup *member;

diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index bec7c9b17a8e6928fbf8650d00c4e4389bd83888..cb4d0e58f486febd041255c3f350890e7f989e10 100644 (file)
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -147,8 +147,8 @@ int btrfs_qgroup_rescan(struct btrfs_fs_info *fs_info);
 void btrfs_qgroup_rescan_resume(struct btrfs_fs_info *fs_info);
 int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,
                                     bool interruptible);
-int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,
-                             struct btrfs_fs_info *fs_info, u64 src, u64 dst);
+int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
+                             u64 dst);
 int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,
                              struct btrfs_fs_info *fs_info, u64 src, u64 dst);
 int btrfs_create_qgroup(struct btrfs_trans_handle *trans,