iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: qgroup: Drop fs_info parameter from btrfs_run_qgroups

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:40 +08:00 committed by David Sterba
parent 8696d76045
commit 280f8bd2cb
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/ioctl.c
View File

@ -5177,7 +5177,7 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg)
} }
/* update qgroup status and info */ /* update qgroup status and info */
err = btrfs_run_qgroups(trans, fs_info); err = btrfs_run_qgroups(trans);
if (err < 0) if (err < 0)
btrfs_handle_fs_error(fs_info, err, btrfs_handle_fs_error(fs_info, err,
"failed to update qgroup status and info"); "failed to update qgroup status and info");

4
fs/btrfs/qgroup.c
View File

@ -2193,9 +2193,9 @@ cleanup:
/* /*
* called from commit_transaction. Writes all changed qgroups to disk. * called from commit_transaction. Writes all changed qgroups to disk.
*/ */
int btrfs_run_qgroups(struct btrfs_trans_handle *trans, int btrfs_run_qgroups(struct btrfs_trans_handle *trans)
struct btrfs_fs_info *fs_info)
{ {
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_root *quota_root = fs_info->quota_root; struct btrfs_root *quota_root = fs_info->quota_root;
int ret = 0; int ret = 0;

3
fs/btrfs/qgroup.h
View File

@ -240,8 +240,7 @@ int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr,
u64 num_bytes, struct ulist *old_roots, u64 num_bytes, struct ulist *old_roots,
struct ulist *new_roots); struct ulist *new_roots);
int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans); int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans);
int btrfs_run_qgroups(struct btrfs_trans_handle *trans, int btrfs_run_qgroups(struct btrfs_trans_handle *trans);
struct btrfs_fs_info *fs_info);
int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 srcid, u64 objectid, struct btrfs_fs_info *fs_info, u64 srcid, u64 objectid,
struct btrfs_qgroup_inherit *inherit); struct btrfs_qgroup_inherit *inherit);

2
fs/btrfs/transaction.c
View File

@ -1152,7 +1152,7 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans)
ret = btrfs_run_dev_replace(trans, fs_info); ret = btrfs_run_dev_replace(trans, fs_info);
if (ret) if (ret)
return ret; return ret;
ret = btrfs_run_qgroups(trans, fs_info); ret = btrfs_run_qgroups(trans);
if (ret) if (ret)
return ret; return ret;