Commit a6a7358e authored Jan 08, 2016 by Linus Torvalds

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"

parents 212c7f66 6126eb24

block/blk-merge.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

		/*