summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-29 01:43:19 +0100
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-30 08:05:22 +0100
commit77f111929d024165e736e919187cff017279bebe (patch)
treefb03b66823f8c60e8efcdb40f93fadd2fc283e80
parentNFS: Handle -ENOENT errors in unlink()/rmdir()/rename() (diff)
downloadlinux-77f111929d024165e736e919187cff017279bebe.tar.xz
linux-77f111929d024165e736e919187cff017279bebe.zip
NFS: Ensure that we eject stale inodes as soon as possible
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/dir.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 06f26d40b4fe..32c666c612a1 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -826,6 +826,10 @@ static int nfs_dentry_delete(struct dentry *dentry)
dentry->d_parent->d_name.name, dentry->d_name.name,
dentry->d_flags);
+ /* Unhash any dentry with a stale inode */
+ if (dentry->d_inode != NULL && NFS_STALE(dentry->d_inode))
+ return 1;
+
if (dentry->d_flags & DCACHE_NFSFS_RENAMED) {
/* Unhash it, so that ->d_iput() would be called */
return 1;