diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-08 22:39:09 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-08 22:39:09 +0100 |
| commit | a6a7358e495e7e687938359b4747aafa63c31416 (patch) | |
| tree | ae4a95a790c23db78375476a1938ec888cf50f35 | |
| parent | Merge tag 'dmaengine-fix-4.4' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | Revert "block: Split bios on chunk boundaries" (diff) | |
| download | linux-a6a7358e495e7e687938359b4747aafa63c31416.tar.xz linux-a6a7358e495e7e687938359b4747aafa63c31416.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block revert from Jens Axboe:
"The previous pull request had a split fix for NVMe, however there are
corner cases where that ends up blowing up.
So let's revert it for 4.4. The regression isn't introduced in this
cycle, and it's "just" a performance regression, not a
stability/integrity issue"
* 'for-linus' of git://git.kernel.dk/linux-block:
Revert "block: Split bios on chunk boundaries"
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index e73846a3d08a..e01405a3e8b3 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -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; /* |