summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2012-11-29 22:11:06 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2012-11-29 22:11:06 -0500
commit0903a0c8491c1e987dfc6eb294199a36760398bc (patch)
treec84f18c8cb39af36fc0492ceb930038879be9da1
parentc44600c9d1de64314c2bd58103f15acb53e10073 (diff)
downloadlinux-0903a0c8491c1e987dfc6eb294199a36760398bc.tar.gz
linux-0903a0c8491c1e987dfc6eb294199a36760398bc.tar.bz2
linux-0903a0c8491c1e987dfc6eb294199a36760398bc.zip
cifs: get rid of blind d_drop() in readdir
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/cifs/readdir.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
index f9b5d3d6cf33..1c576e871366 100644
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
@@ -86,14 +86,17 @@ cifs_readdir_lookup(struct dentry *parent, struct qstr *name,
dentry = d_lookup(parent, name);
if (dentry) {
+ int err;
inode = dentry->d_inode;
/* update inode in place if i_ino didn't change */
if (inode && CIFS_I(inode)->uniqueid == fattr->cf_uniqueid) {
cifs_fattr_to_inode(inode, fattr);
return dentry;
}
- d_drop(dentry);
+ err = d_invalidate(dentry);
dput(dentry);
+ if (err)
+ return NULL;
}
dentry = d_alloc(parent, name);