Commit 280f8bd2 authored by Lu Fengqi's avatar Lu Fengqi Committed by David Sterba
Browse files

btrfs: qgroup: Drop fs_info parameter from btrfs_run_qgroups 



It 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>
parent 8696d760

fs/btrfs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -5177,7 +5177,7 @@ static long btrfs_ioctl_qgroup_assign(struct file *file, void __user *arg) 
	}



	/* update qgroup status and info */

	err = btrfs_run_qgroups(trans, fs_info);

	err = btrfs_run_qgroups(trans);

	if (err < 0)

		btrfs_handle_fs_error(fs_info, err,

				      "failed to update qgroup status and info");

fs/btrfs/qgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -2193,9 +2193,9 @@ cleanup: 
/*

 * called from commit_transaction. Writes all changed qgroups to disk.

 */

int btrfs_run_qgroups(struct btrfs_trans_handle *trans,

		      struct btrfs_fs_info *fs_info)

int btrfs_run_qgroups(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_root *quota_root = fs_info->quota_root;

	int ret = 0;

fs/btrfs/qgroup.h

+1 −2
Original line number Diff line number Diff line
@@ -240,8 +240,7 @@ int btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, u64 bytenr, 
				u64 num_bytes, struct ulist *old_roots,

				struct ulist *new_roots);

int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans);

int btrfs_run_qgroups(struct btrfs_trans_handle *trans,

		      struct btrfs_fs_info *fs_info);

int btrfs_run_qgroups(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_qgroup_inherit *inherit);

fs/btrfs/transaction.c

+1 −1
Original line number Diff line number Diff line
@@ -1152,7 +1152,7 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans) 
	ret = btrfs_run_dev_replace(trans, fs_info);

	if (ret)

		return ret;

	ret = btrfs_run_qgroups(trans, fs_info);

	ret = btrfs_run_qgroups(trans);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE