From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 21 Nov 2019 17:16:12 +0000 (-0700)
Subject: Revert "block: split bio if the only bvec's length is > SZ_4K"
X-Git-Tag: for-5.5/block-20191121^0
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=refs%2Fheads%2Ffor-5.5%2Fblock;p=linux-2.6-block.git

Revert "block: split bio if the only bvec's length is > SZ_4K"

We really don't need this, as the slow path will do the right thing
anyway.

This reverts commit 6952a7f8446ee85ea9d10ab87b64797a031eaae3.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-merge.c b/block/blk-merge.c
index f35327f63ef4..d783bdc4559b 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -320,7 +320,7 @@ void __blk_queue_split(struct request_queue *q, struct bio **bio,
 		if (!q->limits.chunk_sectors &&
 		    (*bio)->bi_vcnt == 1 &&
 		    ((*bio)->bi_io_vec[0].bv_len +
-		     (*bio)->bi_io_vec[0].bv_offset) <= SZ_4K) {
+		     (*bio)->bi_io_vec[0].bv_offset) <= PAGE_SIZE) {
 			*nr_segs = 1;
 			break;
 		}