projects/linux·commit 6c0ad5df

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

6c0ad5df · Linus Torvalds <[email protected]> · 2010-03-02 10:33:36 -08:00

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "blkdev: fix merge_bvec_fn return value checks"
Commit
6c0ad5dfd3d5ad6def89b485ee52834547da239b
Parents
b7f3a209 · 9599945b

Merge commit. Changes below are compared with the first parent: b7f3a209.

Changes

1 files changed · +2 −2

FileStatusAddDelContent
fs/bio.cmodified+2−2View file

fs/bio.c

View file
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;