btrfs: qgroup: Drop fs_info parameter from btrfs_del_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 70b6f94..09943e3 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -5173,8 +5173,7 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)
        if (sa->assign) {
                ret = btrfs_add_qgroup_relation(trans, sa->src, sa->dst);
        } else {
-               ret = btrfs_del_qgroup_relation(trans, fs_info,
-                                               sa->src, sa->dst);
+               ret = btrfs_del_qgroup_relation(trans, sa->src, sa->dst);
        }
 
        /* update qgroup status and info */

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 953b0d5..8c6f594 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -1351,9 +1351,10 @@ out:
        return ret;
 }
 
-int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,
-                             struct btrfs_fs_info *fs_info, u64 src, u64 dst)
+int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
+                             u64 dst)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
        int ret = 0;
 
        mutex_lock(&fs_info->qgroup_ioctl_lock);

diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h
index cb4d0e5..539d4c4 100644 (file)
--- a/fs/btrfs/qgroup.h
+++ b/fs/btrfs/qgroup.h
@@ -149,8 +149,8 @@ int btrfs_qgroup_wait_for_completion(struct btrfs_fs_info *fs_info,
                                     bool interruptible);
 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_del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
+                             u64 dst);
 int btrfs_create_qgroup(struct btrfs_trans_handle *trans,
                        struct btrfs_fs_info *fs_info, u64 qgroupid);
 int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,