1 files changed, 4 insertions, 5 deletions

diff --git a/fs/inode.c b/fs/inode.c
index bf21dc6d0dbd..e6d93070f140 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -414,7 +414,8 @@ static void prune_icache(int nr_to_scan)
                         __iget(inode);
                         spin_unlock(&inode_lock);
                         if (remove_inode_buffers(inode))
-                                reap += invalidate_inode_pages(&inode->i_data);
+                                reap += invalidate_mapping_pages(&inode->i_data,
+                                                                0, -1);
                         iput(inode);
                         spin_lock(&inode_lock);
 
@@ -709,7 +710,7 @@ EXPORT_SYMBOL(iunique);
 struct inode *igrab(struct inode *inode)
 {
         spin_lock(&inode_lock);
-        if (!(inode->i_state & (I_FREEING|I_WILL_FREE)))
+        if (!(inode->i_state & (I_FREEING|I_CLEAR|I_WILL_FREE)))
                 __iget(inode);
         else
                 /*
@@ -1160,11 +1161,9 @@ void touch_atime(struct vfsmount *mnt, struct dentry *dentry)
         struct inode *inode = dentry->d_inode;
         struct timespec now;
 
-        if (IS_RDONLY(inode))
-                return;
         if (inode->i_flags & S_NOATIME)
                 return;
-        if (inode->i_sb->s_flags & MS_NOATIME)
+        if (IS_NOATIME(inode))
                 return;
         if ((inode->i_sb->s_flags & MS_NODIRATIME) && S_ISDIR(inode->i_mode))
                 return;