btrfs: rename __btrfs_map_block to btrfs_map_block

Now that the old btrfs_map_block is gone, drop the leading underscores
from __btrfs_map_block.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c
index 1b4d8d60c66f3d7e3e28c9fc3185f1b2980813d4..ead288fa24db69d4d5531bacfcc8982ac49fd00e 100644 (file)
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -623,8 +623,8 @@ static bool btrfs_submit_chunk(struct btrfs_bio *bbio, int mirror_num)
        int error;
 
        btrfs_bio_counter_inc_blocked(fs_info);
-       error = __btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length,
-                                 &bioc, &smap, &mirror_num, 1);
+       error = btrfs_map_block(fs_info, btrfs_op(bio), logical, &map_length,
+                               &bioc, &smap, &mirror_num, 1);
        if (error) {
                ret = errno_to_blk_status(error);
                goto fail;

diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
index fe15367000141a717342206cfdcdb7bd2349faa8..3caf339c4bb3e4768c88707ecda352b739126b3c 100644 (file)
--- a/fs/btrfs/check-integrity.c
+++ b/fs/btrfs/check-integrity.c
@@ -1464,8 +1464,8 @@ static int btrfsic_map_block(struct btrfsic_state *state, u64 bytenr, u32 len,
        struct btrfs_device *device;
 
        length = len;
-       ret = __btrfs_map_block(fs_info, BTRFS_MAP_READ, bytenr, &length, &bioc,
-                               NULL, &mirror_num, 0);
+       ret = btrfs_map_block(fs_info, BTRFS_MAP_READ, bytenr, &length, &bioc,
+                             NULL, &mirror_num, 0);
        if (ret) {
                block_ctx_out->start = 0;
                block_ctx_out->dev_bytenr = 0;

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index dc3f30c79320a18ab1cd391bb63695982d3774ca..5e86bea0a9507ce923de029f3a4bdc93616a4689 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -41,7 +41,7 @@
  *   All new writes will be written to both target and source devices, so even
  *   if replace gets canceled, sources device still contains up-to-date data.
  *
- *   Location:         handle_ops_on_dev_replace() from __btrfs_map_block()
+ *   Location:         handle_ops_on_dev_replace() from btrfs_map_block()
  *   Start:            btrfs_dev_replace_start()
  *   End:              btrfs_dev_replace_finishing()
  *   Content:          Latest data/metadata

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 4c6405c4ce041d523ec794b9ed17e87c7315f355..53059ee04f9b60b799d61d0bfc2b2adce49246e8 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6232,11 +6232,11 @@ static void set_io_stripe(struct btrfs_io_stripe *dst, const struct map_lookup *
                        stripe_offset + (stripe_nr << BTRFS_STRIPE_LEN_SHIFT);
 }
 
-int __btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
-                     u64 logical, u64 *length,
-                     struct btrfs_io_context **bioc_ret,
-                     struct btrfs_io_stripe *smap, int *mirror_num_ret,
-                     int need_raid_map)
+int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
+                   u64 logical, u64 *length,
+                   struct btrfs_io_context **bioc_ret,
+                   struct btrfs_io_stripe *smap, int *mirror_num_ret,
+                   int need_raid_map)
 {
        struct extent_map *em;
        struct map_lookup *map;
@@ -6486,7 +6486,7 @@ int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
                     u64 logical, u64 *length,
                     struct btrfs_io_context **bioc_ret)
 {
-       return __btrfs_map_block(fs_info, op, logical, length, bioc_ret,
+       return btrfs_map_block(fs_info, op, logical, length, bioc_ret,
                                 NULL, NULL, 1);
 }
 
@@ -8066,8 +8066,8 @@ int btrfs_map_repair_block(struct btrfs_fs_info *fs_info,
 
        ASSERT(mirror_num > 0);
 
-       ret = __btrfs_map_block(fs_info, BTRFS_MAP_WRITE, logical, &map_length,
-                               &bioc, smap, &mirror_ret, true);
+       ret = btrfs_map_block(fs_info, BTRFS_MAP_WRITE, logical, &map_length,
+                             &bioc, smap, &mirror_ret, true);
        if (ret < 0)
                return ret;
 

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index 481f3ace988c44e6517fe9749a0f7e4fcf68e0bf..c70805c8d895542574c5d27b290201cfd0560479 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -585,11 +585,11 @@ void btrfs_put_bioc(struct btrfs_io_context *bioc);
 int btrfs_map_sblock(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
                     u64 logical, u64 *length,
                     struct btrfs_io_context **bioc_ret);
-int __btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
-                     u64 logical, u64 *length,
-                     struct btrfs_io_context **bioc_ret,
-                     struct btrfs_io_stripe *smap, int *mirror_num_ret,
-                     int need_raid_map);
+int btrfs_map_block(struct btrfs_fs_info *fs_info, enum btrfs_map_op op,
+                   u64 logical, u64 *length,
+                   struct btrfs_io_context **bioc_ret,
+                   struct btrfs_io_stripe *smap, int *mirror_num_ret,
+                   int need_raid_map);
 int btrfs_map_repair_block(struct btrfs_fs_info *fs_info,
                           struct btrfs_io_stripe *smap, u64 logical,
                           u32 length, int mirror_num);