Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50b3e040 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: qgroup: Rename functions to make it follow reserve,trace,account steps 



Rename btrfs_qgroup_insert_dirty_extent(_nolock) to
btrfs_qgroup_trace_extent(_nolock), according to the new
reserve/trace/account naming schema.

Signed-off-by: default avatarQu Wenruo <quwenruo@cn.fujitsu.com>
Reviewed-and-Tested-by: default avatarGoldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 1d2beaa9

fs/btrfs/delayed-ref.c

+1 −1
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ add_delayed_ref_head(struct btrfs_fs_info *fs_info, 
		qrecord->num_bytes = num_bytes;

		qrecord->old_roots = NULL;



		if(btrfs_qgroup_insert_dirty_extent_nolock(fs_info,

		if(btrfs_qgroup_trace_extent_nolock(fs_info,

					delayed_refs, qrecord))

			kfree(qrecord);

	}

fs/btrfs/extent-tree.c

+3 −3
Original line number Diff line number Diff line
@@ -8571,7 +8571,7 @@ static int account_leaf_items(struct btrfs_trans_handle *trans, 


		num_bytes = btrfs_file_extent_disk_num_bytes(eb, fi);



		ret = btrfs_qgroup_insert_dirty_extent(trans, root->fs_info,

		ret = btrfs_qgroup_trace_extent(trans, root->fs_info,

						bytenr, num_bytes, GFP_NOFS);

		if (ret)

			return ret;
@@ -8721,7 +8721,7 @@ static int account_shared_subtree(struct btrfs_trans_handle *trans, 
			btrfs_set_lock_blocking_rw(eb, BTRFS_READ_LOCK);

			path->locks[level] = BTRFS_READ_LOCK_BLOCKING;



			ret = btrfs_qgroup_insert_dirty_extent(trans,

			ret = btrfs_qgroup_trace_extent(trans,

					root->fs_info, child_bytenr,

					root->nodesize, GFP_NOFS);

			if (ret)

fs/btrfs/qgroup.c

+4 −4
Original line number Diff line number Diff line
@@ -1457,7 +1457,7 @@ int btrfs_qgroup_prepare_account_extents(struct btrfs_trans_handle *trans, 
	return ret;

}



int btrfs_qgroup_insert_dirty_extent_nolock(struct btrfs_fs_info *fs_info,

int btrfs_qgroup_trace_extent_nolock(struct btrfs_fs_info *fs_info,

				struct btrfs_delayed_ref_root *delayed_refs,

				struct btrfs_qgroup_extent_record *record)

{
@@ -1467,7 +1467,7 @@ int btrfs_qgroup_insert_dirty_extent_nolock(struct btrfs_fs_info *fs_info, 
	u64 bytenr = record->bytenr;



	assert_spin_locked(&delayed_refs->lock);

	trace_btrfs_qgroup_insert_dirty_extent(fs_info, record);

	trace_btrfs_qgroup_trace_extent(fs_info, record);



	while (*p) {

		parent_node = *p;
@@ -1486,7 +1486,7 @@ int btrfs_qgroup_insert_dirty_extent_nolock(struct btrfs_fs_info *fs_info, 
	return 0;

}



int btrfs_qgroup_insert_dirty_extent(struct btrfs_trans_handle *trans,

int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans,

		struct btrfs_fs_info *fs_info, u64 bytenr, u64 num_bytes,

		gfp_t gfp_flag)

{
@@ -1509,7 +1509,7 @@ int btrfs_qgroup_insert_dirty_extent(struct btrfs_trans_handle *trans, 
	record->old_roots = NULL;



	spin_lock(&delayed_refs->lock);

	ret = btrfs_qgroup_insert_dirty_extent_nolock(fs_info, delayed_refs,

	ret = btrfs_qgroup_trace_extent_nolock(fs_info, delayed_refs,

						      record);

	spin_unlock(&delayed_refs->lock);

	if (ret > 0)

fs/btrfs/qgroup.h

+7 −6
Original line number Diff line number Diff line
@@ -93,8 +93,8 @@ struct btrfs_delayed_extent_op; 
int btrfs_qgroup_prepare_account_extents(struct btrfs_trans_handle *trans,

					 struct btrfs_fs_info *fs_info);

/*

 * Insert one dirty extent record into @delayed_refs, informing qgroup to

 * account that extent at commit trans time.

 * Inform qgroup to trace one dirty extent, its info is recorded in @record.

 * So qgroup can account it at commit trans time.

 *

 * No lock version, caller must acquire delayed ref lock and allocate memory.

 *
@@ -102,14 +102,15 @@ int btrfs_qgroup_prepare_account_extents(struct btrfs_trans_handle *trans, 
 * Return >0 for existing record, caller can free @record safely.

 * Error is not possible

 */

int btrfs_qgroup_insert_dirty_extent_nolock(

int btrfs_qgroup_trace_extent_nolock(

		struct btrfs_fs_info *fs_info,

		struct btrfs_delayed_ref_root *delayed_refs,

		struct btrfs_qgroup_extent_record *record);



/*

 * Insert one dirty extent record into @delayed_refs, informing qgroup to

 * account that extent at commit trans time.

 * Inform qgroup to trace one dirty extent, specified by @bytenr and

 * @num_bytes.

 * So qgroup can account it at commit trans time.

 *

 * Better encapsulated version.

 *
@@ -117,7 +118,7 @@ int btrfs_qgroup_insert_dirty_extent_nolock( 
 * Return <0 for error, like memory allocation failure or invalid parameter

 * (NULL trans)

 */

int btrfs_qgroup_insert_dirty_extent(struct btrfs_trans_handle *trans,

int btrfs_qgroup_trace_extent(struct btrfs_trans_handle *trans,

		struct btrfs_fs_info *fs_info, u64 bytenr, u64 num_bytes,

		gfp_t gfp_flag);

fs/btrfs/relocation.c

+1 −1
Original line number Diff line number Diff line
@@ -4012,7 +4012,7 @@ static int qgroup_fix_relocated_data_extents(struct btrfs_trans_handle *trans, 
		if (btrfs_file_extent_type(path->nodes[0], fi) !=

				BTRFS_FILE_EXTENT_REG)

			goto next;

		ret = btrfs_qgroup_insert_dirty_extent(trans, fs_info,

		ret = btrfs_qgroup_trace_extent(trans, fs_info,

			btrfs_file_extent_disk_bytenr(path->nodes[0], fi),

			btrfs_file_extent_disk_num_bytes(path->nodes[0], fi),

			GFP_NOFS);