Revert "blkdev: fix merge_bvec_fn return value checks"
authorJens Axboe <jens.axboe@oracle.com>
Tue, 2 Mar 2010 18:17:34 +0000 (19:17 +0100)
committerJens Axboe <jens.axboe@oracle.com>
Tue, 2 Mar 2010 18:17:34 +0000 (19:17 +0100)
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>
fs/bio.c

index 0bda289f86fc265e49faf5d646eee47c4b9b1f07..dc17afd672e354810d4b7b2d54e21d466bf8cca8 100644 (file)
--- 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
                                        .bi_rw = bio->bi_rw,
                                };
 
-                               if (q->merge_bvec_fn(q, &bvm, prev) != prev->bv_len) {
+                               if (q->merge_bvec_fn(q, &bvm, prev) len) {
                                        prev->bv_len -= len;
                                        return 0;
                                }
@@ -608,7 +608,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page
                 * merge_bvec_fn() returns number of bytes it can accept
                 * at this offset
                 */
-               if (q->merge_bvec_fn(q, &bvm, bvec) != bvec->bv_len) {
+               if (q->merge_bvec_fn(q, &bvm, bvec) len) {
                        bvec->bv_page = NULL;
                        bvec->bv_len = 0;
                        bvec->bv_offset = 0;