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

btrfs: Rename __btrfs_free_reserved_extent to btrfs_pin_reserved_extent 



__btrfs_free_reserved_extent now performs the actions of
btrfs_free_and_pin_reserved_extent. But this name is a bit of a
misnomer, since the extent is not really freed but just pinned. Reflect
this in the new name. No semantics changes.

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

fs/btrfs/ctree.h

+2 −2
Original line number Diff line number Diff line
@@ -2449,8 +2449,8 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref); 


int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,

			       u64 start, u64 len, int delalloc);

int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info,

				       u64 start, u64 len);

int btrfs_pin_reserved_extent(struct btrfs_fs_info *fs_info, u64 start,

			      u64 len);

void btrfs_prepare_extent_commit(struct btrfs_fs_info *fs_info);

int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans);

int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans,

fs/btrfs/extent-tree.c

+11 −19
Original line number Diff line number Diff line
@@ -4165,12 +4165,10 @@ again: 
	return ret;

}



static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,

					u64 start, u64 len,

					int pin, int delalloc)

int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,

			       u64 start, u64 len, int delalloc)

{

	struct btrfs_block_group *cache;

	int ret = 0;



	cache = btrfs_lookup_block_group(fs_info, start);

	if (!cache) {
@@ -4179,15 +4177,18 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, 
		return -ENOSPC;

	}



	ret = pin_down_extent(cache, start, len, 1);

	btrfs_add_free_space(cache, start, len);

	btrfs_free_reserved_bytes(cache, len, delalloc);

	trace_btrfs_reserved_extent_free(fs_info, start, len);



	btrfs_put_block_group(cache);

	return ret;

	return 0;

}



int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,

			       u64 start, u64 len, int delalloc)

int btrfs_pin_reserved_extent(struct btrfs_fs_info *fs_info, u64 start, u64 len)

{

	struct btrfs_block_group *cache;

	int ret = 0;



	cache = btrfs_lookup_block_group(fs_info, start);

	if (!cache) {
@@ -4195,18 +4196,9 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, 
		return -ENOSPC;

	}



	btrfs_add_free_space(cache, start, len);

	btrfs_free_reserved_bytes(cache, len, delalloc);

	trace_btrfs_reserved_extent_free(fs_info, start, len);



	ret = pin_down_extent(cache, start, len, 1);

	btrfs_put_block_group(cache);

	return 0;

}



int btrfs_free_and_pin_reserved_extent(struct btrfs_fs_info *fs_info,

				       u64 start, u64 len)

{

	return __btrfs_free_reserved_extent(fs_info, start, len, 1, 0);

	return ret;

}



static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans,

fs/btrfs/tree-log.c

+5 −7
Original line number Diff line number Diff line
@@ -2732,9 +2732,8 @@ static noinline int walk_down_log_tree(struct btrfs_trans_handle *trans, 


				WARN_ON(root_owner !=

					BTRFS_TREE_LOG_OBJECTID);

				ret = btrfs_free_and_pin_reserved_extent(

							fs_info, bytenr,

							blocksize);

				ret = btrfs_pin_reserved_extent(fs_info,

							bytenr, blocksize);

				if (ret) {

					free_extent_buffer(next);

					return ret;
@@ -2815,8 +2814,7 @@ static noinline int walk_up_log_tree(struct btrfs_trans_handle *trans, 
				}



				WARN_ON(root_owner != BTRFS_TREE_LOG_OBJECTID);

				ret = btrfs_free_and_pin_reserved_extent(

						fs_info,

				ret = btrfs_pin_reserved_extent(fs_info,

						path->nodes[*level]->start,

						path->nodes[*level]->len);

				if (ret)
@@ -2898,8 +2896,8 @@ static int walk_log_tree(struct btrfs_trans_handle *trans, 


			WARN_ON(log->root_key.objectid !=

				BTRFS_TREE_LOG_OBJECTID);

			ret = btrfs_free_and_pin_reserved_extent(fs_info,

							next->start, next->len);

			ret = btrfs_pin_reserved_extent(fs_info, next->start,

							next->len);

			if (ret)

				goto out;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE