git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
fs
/
bio.c
diff --git
a/fs/bio.c
b/fs/bio.c
index
e1f9221
..
e7bf6ca
100644
(file)
--- a/
fs/bio.c
+++ b/
fs/bio.c
@@
-554,7
+554,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) < len) {
+ if (q->merge_bvec_fn(q, &bvm, prev) <
prev->bv_
len) {
prev->bv_len -= len;
return 0;
}
prev->bv_len -= len;
return 0;
}
@@
-607,7
+607,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
*/
* 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;
bvec->bv_page = NULL;
bvec->bv_len = 0;
bvec->bv_offset = 0;