diff --git a/[refs] b/[refs] index 4d28ce2b197e..8ac1fde4a011 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 16070428d389ff47aa3476b0911179ad90c640a2 +refs/heads/master: 991721572ef2140c6411894aebefd3377e71a9e7 diff --git a/trunk/fs/bio.c b/trunk/fs/bio.c index 098c12b2d60a..6a0b9ad8f8c9 100644 --- a/trunk/fs/bio.c +++ b/trunk/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); - 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++) {