diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-02 19:17:34 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-02 19:17:34 +0100 |
| commit | 9599945bac93b344519ea97f502cf537124b5a6e (patch) | |
| tree | 34cdb436a1104e25814638f893e82b07dcb573e8 /fs/bio.c | |
| parent | Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| download | linux-9599945bac93b344519ea97f502cf537124b5a6e.tar.xz linux-9599945bac93b344519ea97f502cf537124b5a6e.zip | |
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.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 .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; |