diff options
author | Lu Fengqi <lufq.fnst@cn.fujitsu.com> | 2018-07-18 02:45:31 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-08-06 07:12:51 -0400 |
commit | 6b36f1aa5cda39acac50f6f80c81776a31fccd24 (patch) | |
tree | 1e51d197fd00ed2c1514bc1d2f31e11bdf0755a8 /fs/btrfs/qgroup.c | |
parent | 9f8a6ce6ba8ebeb86de59b1adfdc64087049f76f (diff) |
btrfs: qgroup: Drop fs_info parameter from __del_qgroup_relation
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>
Diffstat (limited to 'fs/btrfs/qgroup.c')
-rw-r--r-- | fs/btrfs/qgroup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 8b71aec85d84..953b0d54e5d6 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c | |||
@@ -1300,9 +1300,10 @@ out: | |||
1300 | return ret; | 1300 | return ret; |
1301 | } | 1301 | } |
1302 | 1302 | ||
1303 | static int __del_qgroup_relation(struct btrfs_trans_handle *trans, | 1303 | static int __del_qgroup_relation(struct btrfs_trans_handle *trans, u64 src, |
1304 | struct btrfs_fs_info *fs_info, u64 src, u64 dst) | 1304 | u64 dst) |
1305 | { | 1305 | { |
1306 | struct btrfs_fs_info *fs_info = trans->fs_info; | ||
1306 | struct btrfs_root *quota_root; | 1307 | struct btrfs_root *quota_root; |
1307 | struct btrfs_qgroup *parent; | 1308 | struct btrfs_qgroup *parent; |
1308 | struct btrfs_qgroup *member; | 1309 | struct btrfs_qgroup *member; |
@@ -1356,7 +1357,7 @@ int btrfs_del_qgroup_relation(struct btrfs_trans_handle *trans, | |||
1356 | int ret = 0; | 1357 | int ret = 0; |
1357 | 1358 | ||
1358 | mutex_lock(&fs_info->qgroup_ioctl_lock); | 1359 | mutex_lock(&fs_info->qgroup_ioctl_lock); |
1359 | ret = __del_qgroup_relation(trans, fs_info, src, dst); | 1360 | ret = __del_qgroup_relation(trans, src, dst); |
1360 | mutex_unlock(&fs_info->qgroup_ioctl_lock); | 1361 | mutex_unlock(&fs_info->qgroup_ioctl_lock); |
1361 | 1362 | ||
1362 | return ret; | 1363 | return ret; |
@@ -1429,9 +1430,8 @@ int btrfs_remove_qgroup(struct btrfs_trans_handle *trans, | |||
1429 | while (!list_empty(&qgroup->groups)) { | 1430 | while (!list_empty(&qgroup->groups)) { |
1430 | list = list_first_entry(&qgroup->groups, | 1431 | list = list_first_entry(&qgroup->groups, |
1431 | struct btrfs_qgroup_list, next_group); | 1432 | struct btrfs_qgroup_list, next_group); |
1432 | ret = __del_qgroup_relation(trans, fs_info, | 1433 | ret = __del_qgroup_relation(trans, qgroupid, |
1433 | qgroupid, | 1434 | list->group->qgroupid); |
1434 | list->group->qgroupid); | ||
1435 | if (ret) | 1435 | if (ret) |
1436 | goto out; | 1436 | goto out; |
1437 | } | 1437 | } |