summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-03-07 15:11:43 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2016-03-14 00:16:06 -0400
commitf8b31710e46c852b2af1635d1b6fab8e69bf7799 (patch)
treef2e6b46ea8d99e05951f5691841913cc1aa2f67a
parentde4acda16e11110bbba5195061789f93a6c0d29d (diff)
downloadlinux-stable-f8b31710e46c852b2af1635d1b6fab8e69bf7799.tar.gz
linux-stable-f8b31710e46c852b2af1635d1b6fab8e69bf7799.tar.bz2
linux-stable-f8b31710e46c852b2af1635d1b6fab8e69bf7799.zip
ceph_fill_trace(): don't bother with d_instantiate(dn, NULL)
... and use d_add(dn, NULL) in case we need to hash a negative unhashed rather than using d_rehash() directly. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/ceph/inode.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 05dd66fe23a2..be2d87f33177 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1236,10 +1236,8 @@ retry_lookup:
dout("d_delete %p\n", dn);
d_delete(dn);
} else {
- dout("d_instantiate %p NULL\n", dn);
- d_instantiate(dn, NULL);
if (have_lease && d_unhashed(dn))
- d_rehash(dn);
+ d_add(dn, NULL);
update_dentry_lease(dn, rinfo->dlease,
session,
req->r_request_started);