btrfs: open code btrfs_map_sblock

btrfs_map_sblock just hard codes three arguments and calls
btrfs_map_sblock.  Remove it as it doesn't provide any real value, but
makes following the btrfs_map_block call chains harder.

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/scrub.c b/fs/btrfs/scrub.c
index 316c5a0e3a44d70bf2e3f30536e30189330777ae..0cf8e2f277dae4b023794c0511ecc245c159f114 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -888,8 +888,9 @@ static void scrub_stripe_report_errors(struct scrub_ctx *sctx,
 
                /* For scrub, our mirror_num should always start at 1. */
                ASSERT(stripe->mirror_num >= 1);
-               ret = btrfs_map_sblock(fs_info, BTRFS_MAP_GET_READ_MIRRORS,
-                                      stripe->logical, &mapped_len, &bioc);
+               ret = btrfs_map_block(fs_info, BTRFS_MAP_GET_READ_MIRRORS,
+                                     stripe->logical, &mapped_len, &bioc,
+                                     NULL, NULL, 1);
                /*
                 * If we failed, dev will be NULL, and later detailed reports
                 * will just be skipped.
@@ -1921,8 +1922,8 @@ static int scrub_raid56_parity_stripe(struct scrub_ctx *sctx,
        bio->bi_end_io = raid56_scrub_wait_endio;
 
        btrfs_bio_counter_inc_blocked(fs_info);
-       ret = btrfs_map_sblock(fs_info, BTRFS_MAP_WRITE, full_stripe_start,
-                              &length, &bioc);
+       ret = btrfs_map_block(fs_info, BTRFS_MAP_WRITE, full_stripe_start,
+                             &length, &bioc, NULL, NULL, 1);
        if (ret < 0) {
                btrfs_put_bioc(bioc);
                btrfs_bio_counter_dec(fs_info);

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 53059ee04f9b60b799d61d0bfc2b2adce49246e8..6141a9fe5a28a06ec224e19286b350e742c3158c 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -6481,15 +6481,6 @@ out:
        return ret;
 }
 
-/* For Scrub/replace */
-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,
-                                NULL, NULL, 1);
-}
-
 static bool dev_args_match_fs_devices(const struct btrfs_dev_lookup_args *args,
                                      const struct btrfs_fs_devices *fs_devices)
 {

diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
index c70805c8d895542574c5d27b290201cfd0560479..3930ee01d6968f50b6443b1fc5004a3515fc88fe 100644 (file)
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
@@ -582,9 +582,6 @@ static inline unsigned long btrfs_chunk_item_size(int num_stripes)
 
 void btrfs_get_bioc(struct btrfs_io_context *bioc);
 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,

diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c
index f1471cb5fe269394fcb9af2021defea31e4cd512..85b8b332add9cf9e2881c713fd98327a130db511 100644 (file)
--- a/fs/btrfs/zoned.c
+++ b/fs/btrfs/zoned.c
@@ -1799,8 +1799,8 @@ static int read_zone_info(struct btrfs_fs_info *fs_info, u64 logical,
        int nmirrors;
        int i, ret;
 
-       ret = btrfs_map_sblock(fs_info, BTRFS_MAP_GET_READ_MIRRORS, logical,
-                              &mapped_length, &bioc);
+       ret = btrfs_map_block(fs_info, BTRFS_MAP_GET_READ_MIRRORS, logical,
+                             &mapped_length, &bioc, NULL, NULL, 1);
        if (ret || !bioc || mapped_length < PAGE_SIZE) {
                ret = -EIO;
                goto out_put_bioc;