aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-08-07 17:32:45 -0400
committerKent Overstreet <kmo@daterainc.com>2013-11-24 01:33:56 -0500
commitee67891bf132612feb7b999ee1f3350b40867cb4 (patch)
treef76ea89886cd12b19dbdde2069bbfaa396e2e35e /drivers/md
parent196d38bccfcfa32faed8c561868336fdfa0fe8e4 (diff)
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>
Diffstat (limited to 'drivers/md')
-rw-r--r--drivers/md/linear.c2
-rw-r--r--drivers/md/raid0.c6
-rw-r--r--drivers/md/raid10.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index fb3b0d04edfb..e9b53e9793bf 100644
--- 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)
326 326
327 rcu_read_unlock(); 327 rcu_read_unlock();
328 328
329 bp = bio_split(bio, end_sector - bio->bi_iter.bi_sector); 329 bp = bio_pair_split(bio, end_sector - bio->bi_iter.bi_sector);
330 330
331 linear_make_request(mddev, &bp->bio1); 331 linear_make_request(mddev, &bp->bio1);
332 linear_make_request(mddev, &bp->bio2); 332 linear_make_request(mddev, &bp->bio2);
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 8ee1a6c658b4..ea754dd1a5f5 100644
--- 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)
534 * refuse to split for us, so we need to split it. 534 * refuse to split for us, so we need to split it.
535 */ 535 */
536 if (likely(is_power_of_2(chunk_sects))) 536 if (likely(is_power_of_2(chunk_sects)))
537 bp = bio_split(bio, chunk_sects - (sector & 537 bp = bio_pair_split(bio, chunk_sects - (sector &
538 (chunk_sects-1))); 538 (chunk_sects-1)));
539 else 539 else
540 bp = bio_split(bio, chunk_sects - 540 bp = bio_pair_split(bio, chunk_sects -
541 sector_div(sector, chunk_sects)); 541 sector_div(sector, chunk_sects));
542 raid0_make_request(mddev, &bp->bio1); 542 raid0_make_request(mddev, &bp->bio1);
543 raid0_make_request(mddev, &bp->bio2); 543 raid0_make_request(mddev, &bp->bio2);
544 bio_pair_release(bp); 544 bio_pair_release(bp);
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index ac4bfa438c57..69c1bc8da88f 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1193,7 +1193,7 @@ static void make_request(struct mddev *mddev, struct bio * bio)
1193 /* This is a one page bio that upper layers 1193 /* This is a one page bio that upper layers
1194 * refuse to split for us, so we need to split it. 1194 * refuse to split for us, so we need to split it.
1195 */ 1195 */
1196 bp = bio_split(bio, chunk_sects - 1196 bp = bio_pair_split(bio, chunk_sects -
1197 (bio->bi_iter.bi_sector & (chunk_sects - 1))); 1197 (bio->bi_iter.bi_sector & (chunk_sects - 1)));
1198 1198
1199 /* Each of these 'make_request' calls will call 'wait_barrier'. 1199 /* Each of these 'make_request' calls will call 'wait_barrier'.