summaryrefslogtreecommitdiffstats
path: root/fs/ceph/inode.c
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 /fs/ceph/inode.c
parentde4acda16e11110bbba5195061789f93a6c0d29d (diff)
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>
Diffstat (limited to 'fs/ceph/inode.c')
-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:
1236 dout("d_delete %p\n", dn); 1236 dout("d_delete %p\n", dn);
1237 d_delete(dn); 1237 d_delete(dn);
1238 } else { 1238 } else {
1239 dout("d_instantiate %p NULL\n", dn);
1240 d_instantiate(dn, NULL);
1241 if (have_lease && d_unhashed(dn)) 1239 if (have_lease && d_unhashed(dn))
1242 d_rehash(dn); 1240 d_add(dn, NULL);
1243 update_dentry_lease(dn, rinfo->dlease, 1241 update_dentry_lease(dn, rinfo->dlease,
1244 session, 1242 session,
1245 req->r_request_started); 1243 req->r_request_started);