Commit 460fb20a authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Drop fs_info parameter from btrfs_qgroup_account_extents 



It's provided by the transaction handle.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c79a70b1

fs/btrfs/qgroup.c

+2 −2
Original line number Diff line number Diff line
@@ -2014,9 +2014,9 @@ btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, 
	return ret;

}



int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans,

				 struct btrfs_fs_info *fs_info)

int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans)

{

	struct btrfs_fs_info *fs_info = trans->fs_info;

	struct btrfs_qgroup_extent_record *record;

	struct btrfs_delayed_ref_root *delayed_refs;

	struct ulist *new_roots = NULL;

fs/btrfs/qgroup.h

+1 −2
Original line number Diff line number Diff line
@@ -220,8 +220,7 @@ btrfs_qgroup_account_extent(struct btrfs_trans_handle *trans, 
			    struct btrfs_fs_info *fs_info,

			    u64 bytenr, u64 num_bytes,

			    struct ulist *old_roots, struct ulist *new_roots);

int btrfs_qgroup_account_extents(struct btrfs_trans_handle *trans,

				 struct btrfs_fs_info *fs_info);

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_qgroup_inherit(struct btrfs_trans_handle *trans,

fs/btrfs/transaction.c

+2 −2
Original line number Diff line number Diff line
@@ -1369,7 +1369,7 @@ static int qgroup_account_snapshot(struct btrfs_trans_handle *trans, 
	ret = commit_fs_roots(trans);

	if (ret)

		goto out;

	ret = btrfs_qgroup_account_extents(trans, fs_info);

	ret = btrfs_qgroup_account_extents(trans);

	if (ret < 0)

		goto out;
@@ -2185,7 +2185,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) 
	 * Since fs roots are all committed, we can get a quite accurate

	 * new_roots. So let's do quota accounting.

	 */

	ret = btrfs_qgroup_account_extents(trans, fs_info);

	ret = btrfs_qgroup_account_extents(trans);

	if (ret < 0) {

		mutex_unlock(&fs_info->tree_log_mutex);

		mutex_unlock(&fs_info->reloc_mutex);