From afc84e6826efbb3a4e390e28f5183626b7aff016 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Wed, 27 Sep 2006 14:45:07 -0400
Subject: [PATCH] --- yaml --- r: 38871 b: refs/heads/master c:
 0e0bcae3bfb3c88dbe14735fa69d7d88794dc73a h: refs/heads/master i:   38869:
 0eb0cec70f2e017720637c16e7d1b1ea71812864   38867:
 1b812c803febd80be69b0826a53d79136296d1e8   38863:
 444e5c3b9a93527eca65d0671e40782aa8153161 v: v3

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

diff --git a/[refs] b/[refs]
index 7ebebdd10614..c0c18d78d079 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e18c02be7c83a8cfd1319f0117f63509c20aa8e
+refs/heads/master: 0e0bcae3bfb3c88dbe14735fa69d7d88794dc73a
diff --git a/trunk/mm/filemap.c b/trunk/mm/filemap.c
index d9bbea1e87d2..91a741ddd49d 100644
--- a/trunk/mm/filemap.c
+++ b/trunk/mm/filemap.c
@@ -1180,9 +1180,10 @@ __generic_file_aio_read(struct kiocb *iocb, const struct iovec *iov,
 			if (retval > 0)
 				*ppos = pos + retval;
 		}
-		file_accessed(filp);
-		if (retval != 0)
+		if (likely(retval != 0)) {
+			file_accessed(flip);
 			goto out;
+		}
 	}
 
 	retval = 0;