Commit db3a1bac authored by David Sterba's avatar David Sterba
Browse files

btrfs: merge alloc_dummy_extent_buffer() helpers 



After previous patch removing nodesize from parameters,
__alloc_dummy_extent_buffer() and alloc_dummy_extent_buffer() are
identical so we can drop one.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 551561c3

fs/btrfs/extent_io.c

+2 −8
Original line number Diff line number Diff line
@@ -2706,7 +2706,7 @@ struct extent_buffer *btrfs_clone_extent_buffer(const struct extent_buffer *src) 
	return new;

}



struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

						u64 start)

{

	struct extent_buffer *eb;
@@ -2744,12 +2744,6 @@ struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info, 
	return NULL;

}



struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

						u64 start)

{

	return __alloc_dummy_extent_buffer(fs_info, start);

}



static void check_buffer_tree_ref(struct extent_buffer *eb)

{

	int refs;

fs/btrfs/extent_io.h

+0 −2
Original line number Diff line number Diff line
@@ -252,8 +252,6 @@ void clear_folio_extent_mapped(struct folio *folio); 


struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,

					  u64 start, u64 owner_root, int level);

struct extent_buffer *__alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

						  u64 start);

struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,

						u64 start);

struct extent_buffer *btrfs_clone_extent_buffer(const struct extent_buffer *src);

fs/btrfs/tests/extent-io-tests.c

+3 −3
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize) 
		goto out;

	}



	eb = __alloc_dummy_extent_buffer(fs_info, 0);

	eb = alloc_dummy_extent_buffer(fs_info, 0);

	if (!eb) {

		test_std_err(TEST_ALLOC_ROOT);

		ret = -ENOMEM;
@@ -542,7 +542,7 @@ static int test_eb_bitmaps(u32 sectorsize, u32 nodesize) 
	 * Test again for case where the tree block is sectorsize aligned but

	 * not nodesize aligned.

	 */

	eb = __alloc_dummy_extent_buffer(fs_info, sectorsize);

	eb = alloc_dummy_extent_buffer(fs_info, sectorsize);

	if (!eb) {

		test_std_err(TEST_ALLOC_ROOT);

		ret = -ENOMEM;
@@ -730,7 +730,7 @@ static int test_eb_mem_ops(u32 sectorsize, u32 nodesize) 
		goto out;

	}



	eb = __alloc_dummy_extent_buffer(fs_info, SZ_1M);

	eb = alloc_dummy_extent_buffer(fs_info, SZ_1M);

	if (!eb) {

		test_std_err(TEST_ALLOC_EXTENT_BUFFER);

		ret = -ENOMEM;