From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 2 Mar 2010 18:17:34 +0000 (+0100)
Subject: Revert "blkdev: fix merge_bvec_fn return value checks"
X-Git-Tag: v2.6.34-rc1~231^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9599945bac93b344519ea97f502cf537124b5a6e;p=profile%2Fcommon%2Fkernel-common.git

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>
---

diff --git a/fs/bio.c b/fs/bio.c
index 0bda289..dc17afd 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
 					.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;