summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-29 22:00:51 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-29 22:00:51 -0500
commit696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c (patch)
tree349a19fcbcf5253a58758f919e26df632f701833
parente23739b4ade80a3a7f87198f008f6c44a7cbc9fd (diff)
downloadop-kernel-dev-696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c.zip
op-kernel-dev-696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c.tar.gz
don't do blind d_drop() in nfs_prime_dcache()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/nfs/dir.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index ce8cb92..99489cf 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -450,7 +450,8 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
nfs_refresh_inode(dentry->d_inode, entry->fattr);
goto out;
} else {
- d_drop(dentry);
+ if (d_invalidate(dentry) != 0)
+ goto out;
dput(dentry);
}
}
OpenPOWER on IntegriCloud