blkdev: fix merge_bvec_fn return value checks
authorDmitry Monakhov <dmonakhov@openvz.org>
Sat, 27 Feb 2010 17:35:12 +0000 (20:35 +0300)
committerJens Axboe <jens.axboe@oracle.com>
Sun, 28 Feb 2010 18:47:18 +0000 (19:47 +0100)
merge_bvec_fn() returns bvec->bv_len on success. So we have to check
against this value. But in case of fs_optimization merge we compare
with wrong value. This patch must be included in
 b428cd6da7e6559aca69aa2e3a526037d3f20403
But accidentally i've forgot to add this in the initial patch.
To make things straight let's replace all such checks.
In fact this makes code easy to understand.

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
fs/bio.c

index dc17afd672e354810d4b7b2d54e21d466bf8cca8..0bda289f86fc265e49faf5d646eee47c4b9b1f07 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) len) {
+                               if (q->merge_bvec_fn(q, &bvm, prev) != prev->bv_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) len) {
+               if (q->merge_bvec_fn(q, &bvm, bvec) != bvec->bv_len) {
                        bvec->bv_page = NULL;
                        bvec->bv_len = 0;
                        bvec->bv_offset = 0;