Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 3 insertions, 2 deletions

diff --git a/fs/bio.c b/fs/bio.c
index 098c12b2d60a..6a0b9ad8f8c9 100644
--- 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(&current->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++) {