3 files changed, 9 insertions, 4 deletions

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index cf5d1faed7af..9b43fd46aaad 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -552,6 +552,7 @@ static int fuse_readdir(struct file *file, void *dstbuf, filldir_t filldir)
                                     filldir);
 
         __free_page(page);
+        fuse_invalidate_attr(inode); /* atime changed */
         return err;
 }
 
@@ -585,6 +586,7 @@ static char *read_link(struct dentry *dentry)
                 link[req->out.args[0].size] = '\0';
  out:
         fuse_put_request(fc, req);
+        fuse_invalidate_attr(inode); /* atime changed */
         return link;
 }
 
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index a8dc88527fbe..6dcae74ce7fa 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -244,6 +244,7 @@ static int fuse_readpage(struct file *file, struct page *page)
         fuse_put_request(fc, req);
         if (!err)
                 SetPageUptodate(page);
+        fuse_invalidate_attr(inode); /* atime changed */
  out:
         unlock_page(page);
         return err;
@@ -312,6 +313,7 @@ static int fuse_readpages(struct file *file, struct address_space *mapping,
         if (!err && data.req->num_pages)
                 err = fuse_send_readpages(data.req, file, inode);
         fuse_put_request(fc, data.req);
+        fuse_invalidate_attr(inode); /* atime changed */
         return err;
 }
 
@@ -380,8 +382,8 @@ static int fuse_commit_write(struct file *file, struct page *page,
                         clear_page_dirty(page);
                         SetPageUptodate(page);
                 }
-        } else if (err == -EINTR || err == -EIO)
-                fuse_invalidate_attr(inode);
+        }
+        fuse_invalidate_attr(inode);
         return err;
 }
 
@@ -473,8 +475,8 @@ static ssize_t fuse_direct_io(struct file *file, const char __user *buf,
                 if (write && pos > i_size_read(inode))
                         i_size_write(inode, pos);
                 *ppos = pos;
-        } else if (write && (res == -EINTR || res == -EIO))
-                fuse_invalidate_attr(inode);
+        }
+        fuse_invalidate_attr(inode);
 
         return res;
 }
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 8dc66760b41a..52e954f4bb91 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -173,6 +173,7 @@ struct inode *fuse_iget(struct super_block *sb, unsigned long nodeid,
                 return NULL;
 
         if ((inode->i_state & I_NEW)) {
+                inode->i_flags |= S_NOATIME|S_NOCMTIME;
                 inode->i_generation = generation;
                 inode->i_data.backing_dev_info = &fc->bdi;
                 fuse_init_inode(inode, attr);