aboutsummaryrefslogtreecommitdiffstats
path: root/fs/bio.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2010-03-02 13:17:34 -0500
committerJens Axboe <jens.axboe@oracle.com>2010-03-02 13:17:34 -0500
commit9599945bac93b344519ea97f502cf537124b5a6e (patch)
tree34cdb436a1104e25814638f893e82b07dcb573e8 /fs/bio.c
parent13dda80e48439b446d0bc9bab34b91484bc8f533 (diff)
Revert "blkdev: fix merge_bvec_fn return value checks"
This reverts commit 9f7cdbc33f36d28e57eaba0093f68f0d14c38c5b. It's causing oopses om dm setups, so revert it until we investigate. Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Tested-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/bio.c')
-rw-r--r--fs/bio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bio.c b/fs/bio.c
index 0bda289f86fc..dc17afd672e3 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -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;