From f1c271e599bb4bd470cdbb99b1eb85951a0878ba Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sun, 30 Oct 2005 15:02:40 -0800
Subject: [PATCH] --- yaml --- r: 11845 b: refs/heads/master c:
 39e88ca2c9d0f6d1e9f34ea2a6e86a652bb69a7a h: refs/heads/master i:   11843:
 d6ebb6c0c9877fa6b5cca5ab49f41b12641bb932 v: v3

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

diff --git a/[refs] b/[refs]
index 4fbc8bb53794..216af933bedc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30e0fca6c1d7d26f3f2daa4dd2b12c51dadc778a
+refs/heads/master: 39e88ca2c9d0f6d1e9f34ea2a6e86a652bb69a7a
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index 768687f1d46b..5d6e4c2000dc 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1030,8 +1030,8 @@ __generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 			desc.error = 0;
 			do_generic_file_read(filp,ppos,&desc,file_read_actor);
 			retval += desc.written;
-			if (!retval) {
-				retval = desc.error;
+			if (desc.error) {
+				retval = retval ?: desc.error;
 				break;
 			}
 		}