diff options
| author | Al Viro | 2012-11-30 04:00:51 +0100 |
|---|---|---|
| committer | Al Viro | 2012-11-30 04:00:51 +0100 |
| commit | 696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c (patch) | |
| tree | 349a19fcbcf5253a58758f919e26df632f701833 /fs/nfs/dir.c | |
| parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | kernel-qcow2-linux-696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c.tar.gz kernel-qcow2-linux-696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c.tar.xz kernel-qcow2-linux-696199f8ccf7fc6d17ef89c296ad3b6c78c52d9c.zip | |
don't do blind d_drop() in nfs_prime_dcache()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs/dir.c')
| -rw-r--r-- | fs/nfs/dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index ce8cb926526b..99489cfca24d 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); } } |