projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MMC] sdhci: correct register order
[deliverable/linux.git]
/
fs
/
bio.c
diff --git
a/fs/bio.c
b/fs/bio.c
index eb8fbc53f2cd73273c8639c4dcb0648b30d15f70..6a0b9ad8f8c9d031d4c32fb32e1c53e0677d1ef2 100644
(file)
--- a/
fs/bio.c
+++ b/
fs/bio.c
@@
-654,9
+654,10
@@
static struct bio *__bio_map_user_iov(request_queue_t *q,
write_to_vm, 0, &pages[cur_page], NULL);
up_read(¤t->mm->mmap_sem);
write_to_vm, 0, &pages[cur_page], NULL);
up_read(¤t->mm->mmap_sem);
- if (ret < local_nr_pages)
+ if (ret < local_nr_pages) {
+ ret = -EFAULT;
goto out_unmap;
goto out_unmap;
-
+ }
offset = uaddr & ~PAGE_MASK;
for (j = cur_page; j < page_limit; j++) {
offset = uaddr & ~PAGE_MASK;
for (j = cur_page; j < page_limit; j++) {
@@
-1116,6
+1117,9
@@
struct bio_pair *bio_split(struct bio *bi, mempool_t *pool, int first_sectors)
bp->bio1.bi_io_vec = &bp->bv1;
bp->bio2.bi_io_vec = &bp->bv2;
bp->bio1.bi_io_vec = &bp->bv1;
bp->bio2.bi_io_vec = &bp->bv2;
+ bp->bio1.bi_max_vecs = 1;
+ bp->bio2.bi_max_vecs = 1;
+
bp->bio1.bi_end_io = bio_pair_end_1;
bp->bio2.bi_end_io = bio_pair_end_2;
bp->bio1.bi_end_io = bio_pair_end_1;
bp->bio2.bi_end_io = bio_pair_end_2;
This page took
0.026509 seconds
and
5
git commands to generate.