2 files changed, 13 insertions, 7 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 469387920dd9..c44cd02e5181 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -876,11 +876,19 @@ int nfs_post_op_update_inode(struct inode *inode, struct nfs_fattr *fattr)
 {
         struct nfs_inode *nfsi = NFS_I(inode);
 
-        if (fattr->valid & NFS_ATTR_FATTR)
+        if (fattr->valid & NFS_ATTR_FATTR) {
+                if (S_ISDIR(inode->i_mode)) {
+                        spin_lock(&inode->i_lock);
+                        nfsi->cache_validity |= NFS_INO_INVALID_DATA;
+                        spin_unlock(&inode->i_lock);
+                }
                 return nfs_refresh_inode(inode, fattr);
+        }
 
         spin_lock(&inode->i_lock);
         nfsi->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE;
+        if (S_ISDIR(inode->i_mode))
+                nfsi->cache_validity |= NFS_INO_INVALID_DATA;
         spin_unlock(&inode->i_lock);
         return 0;
 }
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 30d5dd5735cd..cb99fd90a9ac 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -208,12 +208,10 @@ static void update_changeattr(struct inode *dir, struct nfs4_change_info *cinfo)
         struct nfs_inode *nfsi = NFS_I(dir);
 
         spin_lock(&dir->i_lock);
-        if (cinfo->after != nfsi->change_attr) {
-                nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA;
-                if (!cinfo->atomic || cinfo->before != nfsi->change_attr)
-                        nfsi->cache_change_attribute = jiffies;
-                nfsi->change_attr = cinfo->after;
-        }
+        nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE|NFS_INO_INVALID_DATA;
+        if (!cinfo->atomic || cinfo->before != nfsi->change_attr)
+                nfsi->cache_change_attribute = jiffies;
+        nfsi->change_attr = cinfo->after;
         spin_unlock(&dir->i_lock);
 }