OSDN Git Service

btrfs: qgroup: Drop quota_root parameter from del_qgroup_relation_item
authorLu Fengqi <lufq.fnst@cn.fujitsu.com>
Wed, 18 Jul 2018 06:45:25 +0000 (14:45 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 6 Aug 2018 11:12:50 +0000 (13:12 +0200)
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>
fs/btrfs/qgroup.c

index 4f523b7..c22f1e6 100644 (file)
@@ -554,11 +554,11 @@ static int add_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,
        return ret;
 }
 
-static int del_qgroup_relation_item(struct btrfs_trans_handle *trans,
-                                   struct btrfs_root *quota_root,
-                                   u64 src, u64 dst)
+static int del_qgroup_relation_item(struct btrfs_trans_handle *trans, u64 src,
+                                   u64 dst)
 {
        int ret;
+       struct btrfs_root *quota_root = trans->fs_info->quota_root;
        struct btrfs_path *path;
        struct btrfs_key key;
 
@@ -1280,7 +1280,7 @@ int btrfs_add_qgroup_relation(struct btrfs_trans_handle *trans,
 
        ret = add_qgroup_relation_item(trans, dst, src);
        if (ret) {
-               del_qgroup_relation_item(trans, quota_root, src, dst);
+               del_qgroup_relation_item(trans, src, dst);
                goto out;
        }
 
@@ -1334,8 +1334,8 @@ static int __del_qgroup_relation(struct btrfs_trans_handle *trans,
        ret = -ENOENT;
        goto out;
 exist:
-       ret = del_qgroup_relation_item(trans, quota_root, src, dst);
-       err = del_qgroup_relation_item(trans, quota_root, dst, src);
+       ret = del_qgroup_relation_item(trans, src, dst);
+       err = del_qgroup_relation_item(trans, dst, src);
        if (err && !ret)
                ret = err;