OSDN Git Service

btrfs: qgroup: Drop quota_root and fs_info parameters from update_qgroup_status_item
authorLu Fengqi <lufq.fnst@cn.fujitsu.com>
Wed, 18 Jul 2018 06:45:29 +0000 (14:45 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 6 Aug 2018 11:12:50 +0000 (13:12 +0200)
They 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 f4b25e0..a789018 100644 (file)
@@ -787,10 +787,10 @@ out:
        return ret;
 }
 
-static int update_qgroup_status_item(struct btrfs_trans_handle *trans,
-                                    struct btrfs_fs_info *fs_info,
-                                   struct btrfs_root *root)
+static int update_qgroup_status_item(struct btrfs_trans_handle *trans)
 {
+       struct btrfs_fs_info *fs_info = trans->fs_info;
+       struct btrfs_root *quota_root = fs_info->quota_root;
        struct btrfs_path *path;
        struct btrfs_key key;
        struct extent_buffer *l;
@@ -806,7 +806,7 @@ static int update_qgroup_status_item(struct btrfs_trans_handle *trans,
        if (!path)
                return -ENOMEM;
 
-       ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
+       ret = btrfs_search_slot(trans, quota_root, &key, path, 0, 1);
        if (ret > 0)
                ret = -ENOENT;
 
@@ -2227,7 +2227,7 @@ int btrfs_run_qgroups(struct btrfs_trans_handle *trans,
                fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_ON;
        spin_unlock(&fs_info->qgroup_lock);
 
-       ret = update_qgroup_status_item(trans, fs_info, quota_root);
+       ret = update_qgroup_status_item(trans);
        if (ret)
                fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT;
 
@@ -2795,7 +2795,7 @@ out:
                          err);
                goto done;
        }
-       ret = update_qgroup_status_item(trans, fs_info, fs_info->quota_root);
+       ret = update_qgroup_status_item(trans);
        if (ret < 0) {
                err = ret;
                btrfs_err(fs_info, "fail to update qgroup status: %d", err);