xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: qgroup: Drop fs_info parameter from __del_qgroup_relation

Browse Source 
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>
This commit is contained in:
Lu Fengqi
2018-07-18 14:45:31 +08:00
committed by David Sterba
parent 9f8a6ce6ba
commit 6b36f1aa5c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/btrfs/qgroup.c
View File

@@ -1300,9 +1300,10 @@ out:
return ret; return ret;
} }
static int __del_qgroup_relation(struct btrfs_trans_handle *trans, static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src,
struct btrfs_fs_info *fs_info, u64 src, u64 dst) u64 dst)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_root *quota_root; struct btrfs_root *quota_root;
struct btrfs_qgroup *parent; struct btrfs_qgroup *parent;
struct btrfs_qgroup *member; struct btrfs_qgroup *member;
@@ -1356,7 +1357,7 @@ int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans,
int ret = 0; int ret = 0;
mutex_lock(&fs_info->qgroup_ioctl_lock); mutex_lock(&fs_info->qgroup_ioctl_lock);
ret = __del_qgroup_relation(trans, fs_info, src, dst); ret = __del_qgroup_relation(trans, src, dst);
mutex_unlock(&fs_info->qgroup_ioctl_lock); mutex_unlock(&fs_info->qgroup_ioctl_lock);
return ret; return ret;
@@ -1429,9 +1430,8 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans,
while (!list_empty(&qgroup->groups)) { while (!list_empty(&qgroup->groups)) {
list = list_first_entry(&qgroup->groups, list = list_first_entry(&qgroup->groups,
struct btrfs_qgroup_list, next_group); struct btrfs_qgroup_list, next_group);
ret = __del_qgroup_relation(trans, fs_info, ret = __del_qgroup_relation(trans, qgroupid,
qgroupid, list->group->qgroupid);
list->group->qgroupid);
if (ret) if (ret)
goto out; goto out;
} }