| From 4bc17577373089cea92ef7f1fa286c428b9ee82a Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 18 Jul 2018 14:45:29 +0800 |
| Subject: btrfs: qgroup: Drop quota_root and fs_info parameters from |
| update_qgroup_status_item |
| |
| From: Lu Fengqi <lufq.fnst@cn.fujitsu.com> |
| |
| [ Upstream commit 2e980acdd829742966c6a7e565ef3382c0717295 ] |
| |
| 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> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| fs/btrfs/qgroup.c | 12 ++++++------ |
| 1 file changed, 6 insertions(+), 6 deletions(-) |
| |
| diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c |
| index f25233093d68c..088dc7d38c136 100644 |
| --- a/fs/btrfs/qgroup.c |
| +++ b/fs/btrfs/qgroup.c |
| @@ -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); |
| -- |
| 2.20.1 |
| |