Commit ee67891b authored by Kent Overstreet's avatar Kent Overstreet
Browse files

block: Rename bio_split() -> bio_pair_split() 



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

Signed-off-by: default avatarKent 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>
parent 196d38bc

drivers/block/pktcdvd.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/md/linear.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/md/raid0.c

+3 −3
Original line number Diff line number Diff line
@@ -534,10 +534,10 @@ 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 -

			bp = bio_pair_split(bio, chunk_sects -

					    sector_div(sector, chunk_sects));

		raid0_make_request(mddev, &bp->bio1);

		raid0_make_request(mddev, &bp->bio2);

drivers/md/raid10.c

+1 −1
Original line number Diff line number Diff line
@@ -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'.

fs/bio.c

+2 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE