Skip to content

Commit 6126eb2

Browse files
committed
Revert "block: Split bios on chunk boundaries"
This reverts commit d380561. If we end up splitting on the first segment, we don't adjust the sector count. That results in hitting a BUG() with attempting to split 0 sectors. As this is just a performance issue and not a regression since 4.3 release, let's just rever this change. That gives us more time to test a real fix for 4.5, which would be marked for stable anyway.
1 parent 02006f7 commit 6126eb2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

block/blk-merge.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
8181
struct bio *new = NULL;
8282

8383
bio_for_each_segment(bv, bio, iter) {
84-
if (sectors + (bv.bv_len >> 9) > blk_max_size_offset(q, bio->bi_iter.bi_sector))
84+
if (sectors + (bv.bv_len >> 9) > queue_max_sectors(q))
8585
goto split;
8686

8787
/*

0 commit comments

Comments
 (0)