2 files changed, 7 insertions, 2 deletions

diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 4b5762ef7c2b..ba95eea201bf 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -1104,7 +1104,7 @@ int ceph_fill_trace(struct super_block *sb, struct ceph_mds_request *req,
                                 pr_err("fill_trace bad get_inode "
                                        "%llx.%llx\n", vino.ino, vino.snap);
                                 err = PTR_ERR(in);
-                                d_delete(dn);
+                                d_drop(dn);
                                 goto done;
                         }
                         dn = splice_dentry(dn, in, &have_lease, true);
@@ -1277,7 +1277,7 @@ retry_lookup:
                         in = ceph_get_inode(parent->d_sb, vino);
                         if (IS_ERR(in)) {
                                 dout("new_inode badness\n");
-                                d_delete(dn);
+                                d_drop(dn);
                                 dput(dn);
                                 err = PTR_ERR(in);
                                 goto out;
diff --git a/fs/ceph/super.c b/fs/ceph/super.c
index 2f586b0e5e0f..2eb43f211325 100644
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
@@ -618,6 +618,11 @@ bad_cap:
 
 static void destroy_caches(void)
 {
+        /*
+         * Make sure all delayed rcu free inodes are flushed before we
+         * destroy cache.
+         */
+        rcu_barrier();
         kmem_cache_destroy(ceph_inode_cachep);
         kmem_cache_destroy(ceph_cap_cachep);
         kmem_cache_destroy(ceph_dentry_cachep);