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 f35327f63ef4db762ac0510c8c7b1978b267879e..d783bdc4559b4de54b19364579326b9f618ebe15 100644 (file)
--- 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;
                }