diff options
-rw-r--r-- | fs/bio.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -555,7 +555,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page | |||
555 | .bi_rw = bio->bi_rw, | 555 | .bi_rw = bio->bi_rw, |
556 | }; | 556 | }; |
557 | 557 | ||
558 | if (q->merge_bvec_fn(q, &bvm, prev) != prev->bv_len) { | 558 | if (q->merge_bvec_fn(q, &bvm, prev) < len) { |
559 | prev->bv_len -= len; | 559 | prev->bv_len -= len; |
560 | return 0; | 560 | return 0; |
561 | } | 561 | } |
@@ -608,7 +608,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page | |||
608 | * merge_bvec_fn() returns number of bytes it can accept | 608 | * merge_bvec_fn() returns number of bytes it can accept |
609 | * at this offset | 609 | * at this offset |
610 | */ | 610 | */ |
611 | if (q->merge_bvec_fn(q, &bvm, bvec) != bvec->bv_len) { | 611 | if (q->merge_bvec_fn(q, &bvm, bvec) < len) { |
612 | bvec->bv_page = NULL; | 612 | bvec->bv_page = NULL; |
613 | bvec->bv_len = 0; | 613 | bvec->bv_len = 0; |
614 | bvec->bv_offset = 0; | 614 | bvec->bv_offset = 0; |