lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "blkdev: fix merge_bvec_fn return value checks"
This commit is contained in:
Linus Torvalds
2010-03-02 10:33:36 -08:00
parent b7f3a209e9 9599945bac
commit 6c0ad5dfd3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/bio.c
View File

@@ -555,7 +555,7 @@ static int __bio_add_page(struct request_queue *q, struct bio *bio, struct page
.bi_rw = bio->bi_rw, .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; prev->bv_len -= len;
return 0; 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 * merge_bvec_fn() returns number of bytes it can accept
* at this offset * 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_page = NULL;
bvec->bv_len = 0; bvec->bv_len = 0;
bvec->bv_offset = 0; bvec->bv_offset = 0;