Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d15aa4bd authored by Lu Fengqi's avatar Lu Fengqi Committed by Greg Kroah-Hartman
Browse files

btrfs: qgroup: Drop quota_root and fs_info parameters from update_qgroup_status_item 



[ Upstream commit 2e980acdd829742966c6a7e565ef3382c0717295 ]

They can be fetched from the transaction handle.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7d778376

fs/btrfs/qgroup.c

+6 −6
Original line number Diff line number Diff line
@@ -759,10 +759,10 @@ static int update_qgroup_info_item(struct btrfs_trans_handle *trans, 
	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;
@@ -778,7 +778,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;
@@ -1863,7 +1863,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;
@@ -2403,7 +2403,7 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) 
			  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);