diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-02 10:33:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-02 10:33:36 -0800 |
| commit | 6c0ad5dfd3d5ad6def89b485ee52834547da239b (patch) | |
| tree | 65ae78589671998bc4e8ed6a88a0a9205fbde296 /fs | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6 (diff) | |
| parent | Revert "blkdev: fix merge_bvec_fn return value checks" (diff) | |
| download | linux-dev-6c0ad5dfd3d5ad6def89b485ee52834547da239b.tar.xz linux-dev-6c0ad5dfd3d5ad6def89b485ee52834547da239b.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Revert "blkdev: fix merge_bvec_fn return value checks"
Diffstat (limited to 'fs')
| -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; |