diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-18 01:15:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-18 01:15:45 -0400 |
| commit | ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8 (patch) | |
| tree | 712ae925e95105b763b2fd851348288c53e78d55 /fs/bio.c | |
| parent | db9ca5803566078aafe63cf364ef98b5097e4194 (diff) | |
| parent | 427abfa28afedffadfca9dd8b067eb6d36bac53f (diff) | |
| download | op-kernel-dev-ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8.zip op-kernel-dev-ea6e1e94f2cb9ae54bd1428e1ef3e84a749ceed8.tar.gz | |
Merge branch 'master' into upstream
Diffstat (limited to 'fs/bio.c')
| -rw-r--r-- | fs/bio.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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); - if (ret < local_nr_pages) + if (ret < local_nr_pages) { + ret = -EFAULT; goto out_unmap; - + } offset = uaddr & ~PAGE_MASK; for (j = cur_page; j < page_limit; j++) { |
