1 files changed, 6 insertions, 5 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index ce8cb926526b..a46a74654488 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1155,11 +1155,14 @@ static int nfs_dentry_delete(const struct dentry *dentry)
 
 }
 
+/* Ensure that we revalidate inode->i_nlink */
 static void nfs_drop_nlink(struct inode *inode)
 {
         spin_lock(&inode->i_lock);
-        if (inode->i_nlink > 0)
-                drop_nlink(inode);
+        /* drop the inode if we're reasonably sure this is the last link */
+        if (inode->i_nlink == 1)
+                clear_nlink(inode);
+        NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ATTR;
         spin_unlock(&inode->i_lock);
 }
 
@@ -1174,8 +1177,8 @@ static void nfs_dentry_iput(struct dentry *dentry, struct inode *inode)
                 NFS_I(inode)->cache_validity |= NFS_INO_INVALID_DATA;
 
         if (dentry->d_flags & DCACHE_NFSFS_RENAMED) {
-                drop_nlink(inode);
                 nfs_complete_unlink(dentry, inode);
+                nfs_drop_nlink(inode);
         }
         iput(inode);
 }
@@ -1646,10 +1649,8 @@ static int nfs_safe_remove(struct dentry *dentry)
         if (inode != NULL) {
                 NFS_PROTO(inode)->return_delegation(inode);
                 error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
-                /* The VFS may want to delete this inode */
                 if (error == 0)
                         nfs_drop_nlink(inode);
-                nfs_mark_for_revalidate(inode);
         } else
                 error = NFS_PROTO(dir)->remove(dir, &dentry->d_name);
         if (error == -ENOENT)