block: Rename bio_split() -> bio_pair_split()

This is prep work for introducing a more general bio_split().

Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: NeilBrown <neilb@suse.de>
Cc: Alasdair Kergon <agk@redhat.com>
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
Cc: Peter Osterlund <petero2@telia.com>
Cc: Sage Weil <sage@inktank.com>

diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index ce986bacf7b7bd8166db60247bb3774c1cf56562..28789b82ae7d2dab2aeb1d1c48e3f3a009e026fd 100644 (file)
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2399,7 +2399,7 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio)
                if (last_zone != zone) {
                        BUG_ON(last_zone != zone + pd->settings.size);
                        first_sectors = last_zone - bio->bi_iter.bi_sector;
-                       bp = bio_split(bio, first_sectors);
+                       bp = bio_pair_split(bio, first_sectors);
                        BUG_ON(!bp);
                        pkt_make_request(q, &bp->bio1);
                        pkt_make_request(q, &bp->bio2);

diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index fb3b0d04edfbc516279db093dd41d42d910b292f..e9b53e9793bfd720e5571162df54294e31dfff94 100644 (file)
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -326,7 +326,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio)
 
                rcu_read_unlock();
 
-               bp = bio_split(bio, end_sector - bio->bi_iter.bi_sector);
+               bp = bio_pair_split(bio, end_sector - bio->bi_iter.bi_sector);
 
                linear_make_request(mddev, &bp->bio1);
                linear_make_request(mddev, &bp->bio2);

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 8ee1a6c658b445c0ad858f7703dc1a68f4bf82c5..ea754dd1a5f5f166d51b423b87e2c3e4428cf0e5 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -534,11 +534,11 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio)
                 * refuse to split for us, so we need to split it.
                 */
                if (likely(is_power_of_2(chunk_sects)))
-                       bp = bio_split(bio, chunk_sects - (sector &
+                       bp = bio_pair_split(bio, chunk_sects - (sector &
                                                           (chunk_sects-1)));
                else
-                       bp = bio_split(bio, chunk_sects -
-                                      sector_div(sector, chunk_sects));
+                       bp = bio_pair_split(bio, chunk_sects -
+                                           sector_div(sector, chunk_sects));
                raid0_make_request(mddev, &bp->bio1);
                raid0_make_request(mddev, &bp->bio2);
                bio_pair_release(bp);

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index ac4bfa438c5790acc95820b13b1f049b5327051c..69c1bc8da88f3e93a1c147a5a08091398a46f8d2 100644 (file)
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1193,7 +1193,7 @@ static void make_request(struct mddev *mddev, struct bio * bio)
                /* This is a one page bio that upper layers
                 * refuse to split for us, so we need to split it.
                 */
-               bp = bio_split(bio, chunk_sects -
+               bp = bio_pair_split(bio, chunk_sects -
                               (bio->bi_iter.bi_sector & (chunk_sects - 1)));
 
                /* Each of these 'make_request' calls will call 'wait_barrier'.

diff --git a/fs/bio.c b/fs/bio.c
index b0a16dbc71efba708d9922fc4258e6b95d1e3068..a3e753f4d5a6b951cd62d2a95c29d86edda8175d 100644 (file)
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -1827,7 +1827,7 @@ static void bio_pair_end_2(struct bio *bi, int err)
 /*
  * split a bio - only worry about a bio with a single page in its iovec
  */
-struct bio_pair *bio_split(struct bio *bi, int first_sectors)
+struct bio_pair *bio_pair_split(struct bio *bi, int first_sectors)
 {
        struct bio_pair *bp = mempool_alloc(bio_split_pool, GFP_NOIO);
 
@@ -1874,7 +1874,7 @@ struct bio_pair *bio_split(struct bio *bi, int first_sectors)
 
        return bp;
 }
-EXPORT_SYMBOL(bio_split);
+EXPORT_SYMBOL(bio_pair_split);
 
 /**
  * bio_trim - trim a bio

diff --git a/include/linux/bio.h b/include/linux/bio.h
index 64f5169c224b62a27614316c4c953b1690c85942..aa67af0b31ac14856059ed32eb472b83fa8f99f5 100644 (file)
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
@@ -317,7 +317,7 @@ struct bio_pair {
        atomic_t                        cnt;
        int                             error;
 };
-extern struct bio_pair *bio_split(struct bio *bi, int first_sectors);
+extern struct bio_pair *bio_pair_split(struct bio *bi, int first_sectors);
 extern void bio_pair_release(struct bio_pair *dbio);
 extern void bio_trim(struct bio *bio, int offset, int size);