kclient: ensure materialised dentry is hashed

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 0ce3bbb09a1eb48d6a3e41c68854007462ce2908..430086343713063316b9238e455a1b2fa38d1de3 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -822,6 +822,8 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req,
                        } else
                                dout(10, "dn %p attached to %p ino %llx\n",
                                     dn, dn->d_inode, ceph_ino(dn->d_inode));
+                       if (d_unhashed(dn))
+                               d_rehash(dn);
                }
                BUG_ON(d_unhashed(dn));
                BUG_ON(dn->d_parent != parent);

diff --git a/src/kernel/super.c b/src/kernel/super.c
index 186d61dd34bdca4eb0d542672983bc2d8bd834ed..09a25aa479c1ad3df301aa35e797bfb43f2d6d78 100644 (file)
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -993,8 +993,8 @@ out_kobj:
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)
        kobject_put(ceph_kobj);
        ceph_kobj = 0;
-#endif
 out:
+#endif
        return ret;
 }