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;