From cf19f0122df269bbb4a67094fec53079c120285e Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Fri, 16 Jun 2006 13:02:29 +0200
Subject: [PATCH] --- yaml --- r: 27215 b: refs/heads/master c:
 991721572ef2140c6411894aebefd3377e71a9e7 h: refs/heads/master i:   27213:
 776c3787fd398f7c43c3c2827406f77d3f72c221   27211:
 a6e2813c61e4e556922ee4bfb6e482d2c425e9d9   27207:
 715d0d65a3683cc83eae4ee1117099363e7c85db   27199:
 0b023874cf968b0f00e1312822e3d6df50b30c0d v: v3

---
 [refs]         | 2 +-
 trunk/fs/bio.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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(&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++) {