btrfs: unexport add_extent_mapping()

There's no need to export add_extent_mapping(), as it's only used inside
extent_map.c and in the self tests. For the tests we can use instead
btrfs_add_extent_mapping(), which will accomplish exactly the same as we
don't expect collisions in any of them. So unexport it and make the tests
use btrfs_add_extent_mapping() instead of add_extent_mapping().

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index d29097a8550a4ce9d897905dfaa98a398642ad05..18a5c4332ed6a800271105654737a600e81b2743 100644 (file)
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -366,8 +366,8 @@ static inline void setup_extent_mapping(struct extent_map_tree *tree,
  * into the tree directly, with an additional reference taken, or a
  * reference dropped if the merge attempt was successful.
  */
-int add_extent_mapping(struct extent_map_tree *tree,
-                      struct extent_map *em, int modified)
+static int add_extent_mapping(struct extent_map_tree *tree,
+                             struct extent_map *em, int modified)
 {
        int ret = 0;
 

diff --git a/fs/btrfs/extent_map.h b/fs/btrfs/extent_map.h
index 66f8dd26487be8cffd46757afac0c8813afe2ace..5663137471fe5924f1585824109730b8f3bd2100 100644 (file)
--- a/fs/btrfs/extent_map.h
+++ b/fs/btrfs/extent_map.h
@@ -74,8 +74,6 @@ static inline u64 extent_map_end(struct extent_map *em)
 void extent_map_tree_init(struct extent_map_tree *tree);
 struct extent_map *lookup_extent_mapping(struct extent_map_tree *tree,
                                         u64 start, u64 len);
-int add_extent_mapping(struct extent_map_tree *tree,
-                      struct extent_map *em, int modified);
 void remove_extent_mapping(struct extent_map_tree *tree, struct extent_map *em);
 int split_extent_map(struct btrfs_inode *inode, u64 start, u64 len, u64 pre,
                     u64 new_logical);

diff --git a/fs/btrfs/tests/extent-map-tests.c b/fs/btrfs/tests/extent-map-tests.c
index 1eb442ea89a529c609eceaa1d75183066c1a2381..59bbf714225c17b9e217231f1f045da02f9c093e 100644 (file)
--- a/fs/btrfs/tests/extent-map-tests.c
+++ b/fs/btrfs/tests/extent-map-tests.c
@@ -73,7 +73,7 @@ static int test_case_1(struct btrfs_fs_info *fs_info,
        em->block_start = 0;
        em->block_len = SZ_16K;
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("cannot add extent range [0, 16K)");
@@ -94,7 +94,7 @@ static int test_case_1(struct btrfs_fs_info *fs_info,
        em->block_start = SZ_32K; /* avoid merging */
        em->block_len = SZ_4K;
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("cannot add extent range [16K, 20K)");
@@ -166,7 +166,7 @@ static int test_case_2(struct btrfs_fs_info *fs_info,
        em->block_start = EXTENT_MAP_INLINE;
        em->block_len = (u64)-1;
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("cannot add extent range [0, 1K)");
@@ -187,7 +187,7 @@ static int test_case_2(struct btrfs_fs_info *fs_info,
        em->block_start = SZ_4K;
        em->block_len = SZ_4K;
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("cannot add extent range [4K, 8K)");
@@ -253,7 +253,7 @@ static int __test_case_3(struct btrfs_fs_info *fs_info,
        em->block_start = SZ_4K;
        em->block_len = SZ_4K;
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("cannot add extent range [4K, 8K)");
@@ -357,7 +357,7 @@ static int __test_case_4(struct btrfs_fs_info *fs_info,
        em->block_start = 0;
        em->block_len = SZ_8K;
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("cannot add extent range [0, 8K)");
@@ -378,7 +378,7 @@ static int __test_case_4(struct btrfs_fs_info *fs_info,
        em->block_start = SZ_16K; /* avoid merging */
        em->block_len = 24 * SZ_1K;
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("cannot add extent range [8K, 32K)");
@@ -463,7 +463,8 @@ static int test_case_4(struct btrfs_fs_info *fs_info,
        return ret;
 }
 
-static int add_compressed_extent(struct extent_map_tree *em_tree,
+static int add_compressed_extent(struct btrfs_fs_info *fs_info,
+                                struct extent_map_tree *em_tree,
                                 u64 start, u64 len, u64 block_start)
 {
        struct extent_map *em;
@@ -481,7 +482,7 @@ static int add_compressed_extent(struct extent_map_tree *em_tree,
        em->block_len = SZ_4K;
        set_bit(EXTENT_FLAG_COMPRESSED, &em->flags);
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        free_extent_map(em);
        if (ret < 0) {
@@ -587,7 +588,7 @@ static int validate_range(struct extent_map_tree *em_tree, int index)
  * They'll have the EXTENT_FLAG_COMPRESSED flag set to keep the em tree from
  * merging the em's.
  */
-static int test_case_5(void)
+static int test_case_5(struct btrfs_fs_info *fs_info)
 {
        struct extent_map_tree *em_tree;
        struct inode *inode;
@@ -605,35 +606,35 @@ static int test_case_5(void)
        em_tree = &BTRFS_I(inode)->extent_tree;
 
        /* [0, 12k) */
-       ret = add_compressed_extent(em_tree, 0, SZ_4K * 3, 0);
+       ret = add_compressed_extent(fs_info, em_tree, 0, SZ_4K * 3, 0);
        if (ret) {
                test_err("cannot add extent range [0, 12K)");
                goto out;
        }
 
        /* [12k, 24k) */
-       ret = add_compressed_extent(em_tree, SZ_4K * 3, SZ_4K * 3, SZ_4K);
+       ret = add_compressed_extent(fs_info, em_tree, SZ_4K * 3, SZ_4K * 3, SZ_4K);
        if (ret) {
                test_err("cannot add extent range [12k, 24k)");
                goto out;
        }
 
        /* [24k, 36k) */
-       ret = add_compressed_extent(em_tree, SZ_4K * 6, SZ_4K * 3, SZ_8K);
+       ret = add_compressed_extent(fs_info, em_tree, SZ_4K * 6, SZ_4K * 3, SZ_8K);
        if (ret) {
                test_err("cannot add extent range [12k, 24k)");
                goto out;
        }
 
        /* [36k, 40k) */
-       ret = add_compressed_extent(em_tree, SZ_32K + SZ_4K, SZ_4K, SZ_4K * 3);
+       ret = add_compressed_extent(fs_info, em_tree, SZ_32K + SZ_4K, SZ_4K, SZ_4K * 3);
        if (ret) {
                test_err("cannot add extent range [12k, 24k)");
                goto out;
        }
 
        /* [40k, 64k) */
-       ret = add_compressed_extent(em_tree, SZ_4K * 10, SZ_4K * 6, SZ_16K);
+       ret = add_compressed_extent(fs_info, em_tree, SZ_4K * 10, SZ_4K * 6, SZ_16K);
        if (ret) {
                test_err("cannot add extent range [12k, 24k)");
                goto out;
@@ -685,11 +686,11 @@ static int test_case_6(struct btrfs_fs_info *fs_info, struct extent_map_tree *em
        struct extent_map *em = NULL;
        int ret;
 
-       ret = add_compressed_extent(em_tree, 0, SZ_4K, 0);
+       ret = add_compressed_extent(fs_info, em_tree, 0, SZ_4K, 0);
        if (ret)
                goto out;
 
-       ret = add_compressed_extent(em_tree, SZ_4K, SZ_4K, 0);
+       ret = add_compressed_extent(fs_info, em_tree, SZ_4K, SZ_4K, 0);
        if (ret)
                goto out;
 
@@ -733,7 +734,7 @@ out:
  * true would mess up the start/end calculations and subsequent splits would be
  * incorrect.
  */
-static int test_case_7(void)
+static int test_case_7(struct btrfs_fs_info *fs_info)
 {
        struct extent_map_tree *em_tree;
        struct extent_map *em;
@@ -764,7 +765,7 @@ static int test_case_7(void)
        em->block_len = SZ_4K;
        set_bit(EXTENT_FLAG_PINNED, &em->flags);
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("couldn't add extent map");
@@ -785,7 +786,7 @@ static int test_case_7(void)
        em->block_start = SZ_32K;
        em->block_len = SZ_16K;
        write_lock(&em_tree->lock);
-       ret = add_extent_mapping(em_tree, em, 0);
+       ret = btrfs_add_extent_mapping(fs_info, em_tree, &em, em->start, em->len);
        write_unlock(&em_tree->lock);
        if (ret < 0) {
                test_err("couldn't add extent map");
@@ -1022,13 +1023,13 @@ int btrfs_test_extent_map(void)
        ret = test_case_4(fs_info, em_tree);
        if (ret)
                goto out;
-       ret = test_case_5();
+       ret = test_case_5(fs_info);
        if (ret)
                goto out;
        ret = test_case_6(fs_info, em_tree);
        if (ret)
                goto out;
-       ret = test_case_7();
+       ret = test_case_7(fs_info);
        if (ret)
                goto out;