aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-08 13:39:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-08 13:39:09 -0800
commita6a7358e495e7e687938359b4747aafa63c31416 (patch)
treeae4a95a790c23db78375476a1938ec888cf50f35
parent212c7f66ec7d1c4895a0a50dca3237350ed69505 (diff)
parent6126eb2483a8398329e662eaff5f103e832ed5cb (diff)
downloadleg-kernel-a6a7358e495e7e687938359b4747aafa63c31416.tar.gz
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.c2
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;
/*