evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

block: Rename bio_split() -> bio_pair_split()

Browse source 
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>
This commit is contained in:
Kent Overstreet 2013-08-07 14:32:45 -07:00
parent 196d38bccf
commit ee67891bf1
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/block/pktcdvd.c
View file

@ -2399,7 +2399,7 @@ static void pkt_make_request(struct request_queue *q, struct bio *bio)
if (last_zone != zone) { if (last_zone != zone) {
BUG_ON(last_zone != zone + pd->settings.size); BUG_ON(last_zone != zone + pd->settings.size);
first_sectors = last_zone - bio->bi_iter.bi_sector; 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); BUG_ON(!bp);
pkt_make_request(q, &bp->bio1); pkt_make_request(q, &bp->bio1);
pkt_make_request(q, &bp->bio2); pkt_make_request(q, &bp->bio2);

2
drivers/md/linear.c
View file

@ -326,7 +326,7 @@ static void linear_make_request(struct mddev *mddev, struct bio *bio)
rcu_read_unlock(); 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->bio1);
linear_make_request(mddev, &bp->bio2); linear_make_request(mddev, &bp->bio2);

6
drivers/md/raid0.c
View file

@ -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. * refuse to split for us, so we need to split it.
*/ */
if (likely(is_power_of_2(chunk_sects))) 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))); (chunk_sects-1)));
else else
bp = bio_split(bio, chunk_sects - bp = bio_pair_split(bio, chunk_sects -
sector_div(sector, chunk_sects)); sector_div(sector, chunk_sects));
raid0_make_request(mddev, &bp->bio1); raid0_make_request(mddev, &bp->bio1);
raid0_make_request(mddev, &bp->bio2); raid0_make_request(mddev, &bp->bio2);
bio_pair_release(bp); bio_pair_release(bp);

2
drivers/md/raid10.c
View file

@ -1193,7 +1193,7 @@ static void make_request(struct mddev *mddev, struct bio * bio)
/* This is a one page bio that upper layers /* This is a one page bio that upper layers
* refuse to split for us, so we need to split it. * 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))); (bio->bi_iter.bi_sector & (chunk_sects - 1)));
/* Each of these 'make_request' calls will call 'wait_barrier'. /* Each of these 'make_request' calls will call 'wait_barrier'.

4
fs/bio.c
View file

@ -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 * 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); 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; return bp;
} }
EXPORT_SYMBOL(bio_split); EXPORT_SYMBOL(bio_pair_split);
/** /**
* bio_trim - trim a bio * bio_trim - trim a bio

2
include/linux/bio.h
View file

@ -317,7 +317,7 @@ struct bio_pair {
atomic_t cnt; atomic_t cnt;
int error; 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_pair_release(struct bio_pair *dbio);
extern void bio_trim(struct bio *bio, int offset, int size); extern void bio_trim(struct bio *bio, int offset, int size);