diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-11-21 10:16:12 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-11-21 10:16:12 -0700 |
| commit | 1e279153dfd53e76006720df804d5935a6cbc6d5 (patch) | |
| tree | eef59ed2bb02bc47429997c307d27425490f8b4a /block | |
| parent | b6866318657717c8914673a6394894d12bc9ff5e (diff) | |
| download | linux-rpi-1e279153dfd53e76006720df804d5935a6cbc6d5.tar.gz linux-rpi-1e279153dfd53e76006720df804d5935a6cbc6d5.tar.bz2 linux-rpi-1e279153dfd53e76006720df804d5935a6cbc6d5.zip | |
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>
Diffstat (limited to 'block')
| -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 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; } |