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: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 5ef6dd0782fde73db59c2adbee52115a9d9516e4..3f2bbebe759896155831b7964c49250bb4464463 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2706,8 +2706,8 @@ 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,
-                                                 u64 start)
+struct extent_buffer *alloc_dummy_extent_buffer(struct btrfs_fs_info *fs_info,
+                                               u64 start)
 {
        struct extent_buffer *eb;
        int num_folios = 0;
@@ -2744,12 +2744,6 @@ err:
        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;

diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
index 3413a34585c8c4e28cb912b41979c93ce8682a17..ae0c04019a7eddf6d8de36895043708ea0745c19 100644 (file)
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
@@ -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);

diff --git a/fs/btrfs/tests/extent-io-tests.c b/fs/btrfs/tests/extent-io-tests.c
index 5847cbdc1e90aed62663f17de23ed4330fad277c..74aca7180a5a91678a597f6d04a8e1cd5c34d386 100644 (file)
--- a/fs/btrfs/tests/extent-io-tests.c
+++ b/fs/btrfs/tests/extent-io-tests.c
@@ -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;