diff options
Diffstat (limited to 'block/ll_rw_blk.c')
-rw-r--r-- | block/ll_rw_blk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index c99b46354859..3e7801e49033 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -1304,9 +1304,9 @@ static int blk_hw_contig_segment(request_queue_t *q, struct bio *bio, | |||
1304 | if (unlikely(!bio_flagged(nxt, BIO_SEG_VALID))) | 1304 | if (unlikely(!bio_flagged(nxt, BIO_SEG_VALID))) |
1305 | blk_recount_segments(q, nxt); | 1305 | blk_recount_segments(q, nxt); |
1306 | if (!BIOVEC_VIRT_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)) || | 1306 | if (!BIOVEC_VIRT_MERGEABLE(__BVEC_END(bio), __BVEC_START(nxt)) || |
1307 | BIOVEC_VIRT_OVERSIZE(bio->bi_hw_front_size + bio->bi_hw_back_size)) | 1307 | BIOVEC_VIRT_OVERSIZE(bio->bi_hw_back_size + nxt->bi_hw_front_size)) |
1308 | return 0; | 1308 | return 0; |
1309 | if (bio->bi_size + nxt->bi_size > q->max_segment_size) | 1309 | if (bio->bi_hw_back_size + nxt->bi_hw_front_size > q->max_segment_size) |
1310 | return 0; | 1310 | return 0; |
1311 | 1311 | ||
1312 | return 1; | 1312 | return 1; |