btrfs: rename btrfs_submit_bio() to btrfs_submit_bbio()

The function name is a bit misleading as it submits the btrfs_bio
(bbio), rename it so we can use btrfs_submit_bio() when an actual bio is
submitted.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/bio.c b/fs/btrfs/bio.c
index f6cb58d7f16a46e5280bdc980691e5e0ea8829d8..4f3e265880bfbb4a07be1d9daaaeab3289601207 100644 (file)
--- a/fs/btrfs/bio.c
+++ b/fs/btrfs/bio.c
@@ -53,7 +53,7 @@ void btrfs_bio_init(struct btrfs_bio *bbio, struct btrfs_fs_info *fs_info,
 
 /*
  * Allocate a btrfs_bio structure.  The btrfs_bio is the main I/O container for
- * btrfs, and is used for all I/O submitted through btrfs_submit_bio.
+ * btrfs, and is used for all I/O submitted through btrfs_submit_bbio().
  *
  * Just like the underlying bio_alloc_bioset it will not fail as it is backed by
  * a mempool.
@@ -211,7 +211,7 @@ static void btrfs_end_repair_bio(struct btrfs_bio *repair_bbio,
                        goto done;
                }
 
-               btrfs_submit_bio(repair_bbio, mirror);
+               btrfs_submit_bbio(repair_bbio, mirror);
                return;
        }
 
@@ -280,7 +280,7 @@ static struct btrfs_failed_bio *repair_one_sector(struct btrfs_bio *failed_bbio,
 
        mirror = next_repair_mirror(fbio, failed_bbio->mirror_num);
        btrfs_debug(fs_info, "submitting repair read to mirror %d", mirror);
-       btrfs_submit_bio(repair_bbio, mirror);
+       btrfs_submit_bbio(repair_bbio, mirror);
        return fbio;
 }
 
@@ -777,7 +777,7 @@ fail:
        return true;
 }
 
-void btrfs_submit_bio(struct btrfs_bio *bbio, int mirror_num)
+void btrfs_submit_bbio(struct btrfs_bio *bbio, int mirror_num)
 {
        /* If bbio->inode is not populated, its file_offset must be 0. */
        ASSERT(bbio->inode || bbio->file_offset == 0);
@@ -789,7 +789,7 @@ void btrfs_submit_bio(struct btrfs_bio *bbio, int mirror_num)
 /*
  * Submit a repair write.
  *
- * This bypasses btrfs_submit_bio deliberately, as that writes all copies in a
+ * This bypasses btrfs_submit_bbio() deliberately, as that writes all copies in a
  * RAID setup.  Here we only want to write the one bad copy, so we do the
  * mapping ourselves and submit the bio directly.
  *

diff --git a/fs/btrfs/bio.h b/fs/btrfs/bio.h
index d9dd5276093df03f8f94d28e6a3f9bd86c48fd66..e4861234074588ce0d8debd8b28bc241e498e35c 100644 (file)
--- a/fs/btrfs/bio.h
+++ b/fs/btrfs/bio.h
@@ -29,7 +29,7 @@ typedef void (*btrfs_bio_end_io_t)(struct btrfs_bio *bbio);
 
 /*
  * Highlevel btrfs I/O structure.  It is allocated by btrfs_bio_alloc and
- * passed to btrfs_submit_bio for mapping to the physical devices.
+ * passed to btrfs_submit_bbio() for mapping to the physical devices.
  */
 struct btrfs_bio {
        /*
@@ -42,7 +42,7 @@ struct btrfs_bio {
        union {
                /*
                 * For data reads: checksumming and original I/O information.
-                * (for internal use in the btrfs_submit_bio machinery only)
+                * (for internal use in the btrfs_submit_bbio() machinery only)
                 */
                struct {
                        u8 *csum;
@@ -104,7 +104,7 @@ void btrfs_bio_end_io(struct btrfs_bio *bbio, blk_status_t status);
 /* Submit using blkcg_punt_bio_submit. */
 #define REQ_BTRFS_CGROUP_PUNT                  REQ_FS_PRIVATE
 
-void btrfs_submit_bio(struct btrfs_bio *bbio, int mirror_num);
+void btrfs_submit_bbio(struct btrfs_bio *bbio, int mirror_num);
 void btrfs_submit_repair_write(struct btrfs_bio *bbio, int mirror_num, bool dev_replace);
 int btrfs_repair_io_failure(struct btrfs_fs_info *fs_info, u64 ino, u64 start,
                            u64 length, u64 logical, struct folio *folio,

diff --git a/fs/btrfs/compression.c b/fs/btrfs/compression.c
index 832ab8984c41dd5e01730b1d7c0a2510d3dc30f6..39cd2ed1974bd33f4e57b91458b4323b8857fc18 100644 (file)
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
@@ -395,7 +395,7 @@ void btrfs_submit_compressed_write(struct btrfs_ordered_extent *ordered,
        cb->bbio.ordered = ordered;
        btrfs_add_compressed_bio_folios(cb);
 
-       btrfs_submit_bio(&cb->bbio, 0);
+       btrfs_submit_bbio(&cb->bbio, 0);
 }
 
 /*
@@ -630,7 +630,7 @@ void btrfs_submit_compressed_read(struct btrfs_bio *bbio)
        if (memstall)
                psi_memstall_leave(&pflags);
 
-       btrfs_submit_bio(&cb->bbio, 0);
+       btrfs_submit_bbio(&cb->bbio, 0);
        return;
 
 out_free_compressed_pages:

diff --git a/fs/btrfs/direct-io.c b/fs/btrfs/direct-io.c
index 364bce34f0346bc429b3595f5f1d2f7e6312817a..ea7f918b1c459ca09b87f31b35760f4a39db194a 100644 (file)
--- a/fs/btrfs/direct-io.c
+++ b/fs/btrfs/direct-io.c
@@ -726,7 +726,7 @@ static void btrfs_dio_submit_io(const struct iomap_iter *iter, struct bio *bio,
                }
        }
 
-       btrfs_submit_bio(bbio, 0);
+       btrfs_submit_bbio(bbio, 0);
 }
 
 static const struct iomap_ops btrfs_dio_iomap_ops = {

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 643dd948054f5e60ecdfd66e694a4da5419c8c69..8de6d226475d6e07b2688094071606785080292f 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -117,7 +117,7 @@ static void submit_one_bio(struct btrfs_bio_ctrl *bio_ctrl)
            bio_ctrl->compress_type != BTRFS_COMPRESS_NONE)
                btrfs_submit_compressed_read(bbio);
        else
-               btrfs_submit_bio(bbio, 0);
+               btrfs_submit_bbio(bbio, 0);
 
        /* The bbio is owned by the end_io handler now */
        bio_ctrl->bbio = NULL;
@@ -1800,7 +1800,7 @@ static noinline_for_stack void write_one_eb(struct extent_buffer *eb,
                        folio_unlock(folio);
                }
        }
-       btrfs_submit_bio(bbio, 0);
+       btrfs_submit_bbio(bbio, 0);
 }
 
 /*
@@ -3572,7 +3572,7 @@ int read_extent_buffer_pages(struct extent_buffer *eb, int wait, int mirror_num,
                        ASSERT(ret);
                }
        }
-       btrfs_submit_bio(bbio, mirror_num);
+       btrfs_submit_bbio(bbio, mirror_num);
 
 done:
        if (wait == WAIT_COMPLETE) {

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d25aeb844a642b566ac249aadda8ef0cd93e9fe4..27aa67f135ff62ec05bf588dc151fdc8e3251766 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9152,7 +9152,7 @@ int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
 
                if (bio_add_page(&bbio->bio, pages[i], bytes, 0) < bytes) {
                        atomic_inc(&priv.pending);
-                       btrfs_submit_bio(bbio, 0);
+                       btrfs_submit_bbio(bbio, 0);
 
                        bbio = btrfs_bio_alloc(BIO_MAX_VECS, REQ_OP_READ, fs_info,
                                               btrfs_encoded_read_endio, &priv);
@@ -9167,7 +9167,7 @@ int btrfs_encoded_read_regular_fill_pages(struct btrfs_inode *inode,
        } while (disk_io_size);
 
        atomic_inc(&priv.pending);
-       btrfs_submit_bio(bbio, 0);
+       btrfs_submit_bbio(bbio, 0);
 
        if (atomic_dec_return(&priv.pending))
                io_wait_event(priv.wait, !atomic_read(&priv.pending));

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index b3afa63658231a7b99da9fd1d47851d96d74d530..3a34274280746c56ac926166a0c16a2485ea5646 100644 (file)
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -838,7 +838,7 @@ static void scrub_stripe_submit_repair_read(struct scrub_stripe *stripe,
                             bbio->bio.bi_iter.bi_size >= blocksize)) {
                        ASSERT(bbio->bio.bi_iter.bi_size);
                        atomic_inc(&stripe->pending_io);
-                       btrfs_submit_bio(bbio, mirror);
+                       btrfs_submit_bbio(bbio, mirror);
                        if (wait)
                                wait_scrub_stripe_io(stripe);
                        bbio = NULL;
@@ -857,7 +857,7 @@ static void scrub_stripe_submit_repair_read(struct scrub_stripe *stripe,
        if (bbio) {
                ASSERT(bbio->bio.bi_iter.bi_size);
                atomic_inc(&stripe->pending_io);
-               btrfs_submit_bio(bbio, mirror);
+               btrfs_submit_bbio(bbio, mirror);
                if (wait)
                        wait_scrub_stripe_io(stripe);
        }
@@ -1683,7 +1683,7 @@ static void scrub_submit_extent_sector_read(struct scrub_ctx *sctx,
                     bbio->bio.bi_iter.bi_size >= stripe_len)) {
                        ASSERT(bbio->bio.bi_iter.bi_size);
                        atomic_inc(&stripe->pending_io);
-                       btrfs_submit_bio(bbio, mirror);
+                       btrfs_submit_bbio(bbio, mirror);
                        bbio = NULL;
                }
 
@@ -1720,7 +1720,7 @@ static void scrub_submit_extent_sector_read(struct scrub_ctx *sctx,
        if (bbio) {
                ASSERT(bbio->bio.bi_iter.bi_size);
                atomic_inc(&stripe->pending_io);
-               btrfs_submit_bio(bbio, mirror);
+               btrfs_submit_bbio(bbio, mirror);
        }
 
        if (atomic_dec_and_test(&stripe->pending_io)) {
@@ -1776,7 +1776,7 @@ static void scrub_submit_initial_read(struct scrub_ctx *sctx,
 
                mirror = calc_next_mirror(mirror, num_copies);
        }
-       btrfs_submit_bio(bbio, mirror);
+       btrfs_submit_bbio(bbio, mirror);
 }
 
 static bool stripe_has_metadata_error(struct scrub_stripe *stripe)