Skip to content

Commit

Permalink
Revert "block: Split bios on chunk boundaries"
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
axboe committed Jan 8, 2016
1 parent 02006f7 commit 6126eb2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion block/blk-merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ static struct bio *blk_bio_segment_split(struct request_queue *q,
struct bio *new = NULL;

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

/*
Expand Down

0 comments on commit 6126eb2

Please sign in to comment.