LU-12313 llite: Mark lustre_inode_cache as reclaimable

[fs/lustre-release.git] / lustre / llite / super25.c

diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index bd38776..bf3a131 100644 (file)
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -58,7 +58,6 @@ static struct inode *ll_alloc_inode(struct super_block *sb)
        return &lli->lli_vfs_inode;
 }
 
-#ifdef HAVE_INODE_I_RCU
 static void ll_inode_destroy_callback(struct rcu_head *head)
 {
        struct inode *inode = container_of(head, struct inode, i_rcu);
@@ -70,25 +69,13 @@ static void ll_destroy_inode(struct inode *inode)
 {
        call_rcu(&inode->i_rcu, ll_inode_destroy_callback);
 }
-#else
-static void ll_destroy_inode(struct inode *inode)
-{
-       struct ll_inode_info *ptr = ll_i2info(inode);
-       OBD_SLAB_FREE_PTR(ptr, ll_inode_cachep);
-}
-#endif
 
 /* exported operations */
 struct super_operations lustre_super_operations =
 {
         .alloc_inode   = ll_alloc_inode,
         .destroy_inode = ll_destroy_inode,
-#ifdef HAVE_SBOPS_EVICT_INODE
         .evict_inode   = ll_delete_inode,
-#else
-        .clear_inode   = ll_clear_inode,
-        .delete_inode  = ll_delete_inode,
-#endif
         .put_super     = ll_put_super,
         .statfs        = ll_statfs,
         .umount_begin  = ll_umount_begin,
@@ -100,6 +87,7 @@ static int __init lustre_init(void)
 {
        struct lnet_process_id lnet_id;
        int i, rc;
+       unsigned long lustre_inode_cache_flags;
 
        CLASSERT(sizeof(LUSTRE_VOLATILE_HDR) == LUSTRE_VOLATILE_HDR_LEN + 1);
 
@@ -109,9 +97,15 @@ static int __init lustre_init(void)
        CDEBUG(D_INFO, "Lustre client module (%p).\n",
               &lustre_super_operations);
 
+       lustre_inode_cache_flags = SLAB_HWCACHE_ALIGN | SLAB_RECLAIM_ACCOUNT |
+                                  SLAB_MEM_SPREAD;
+#ifdef SLAB_ACCOUNT
+       lustre_inode_cache_flags |= SLAB_ACCOUNT;
+#endif
+
        ll_inode_cachep = kmem_cache_create("lustre_inode_cache",
                                            sizeof(struct ll_inode_info),
-                                           0, SLAB_HWCACHE_ALIGN, NULL);
+                                           0, lustre_inode_cache_flags, NULL);
        if (ll_inode_cachep == NULL)
                GOTO(out_cache, rc = -ENOMEM);
 
@@ -121,6 +115,12 @@ static int __init lustre_init(void)
        if (ll_file_data_slab == NULL)
                GOTO(out_cache, rc = -ENOMEM);
 
+       pcc_inode_slab = kmem_cache_create("ll_pcc_inode",
+                                          sizeof(struct pcc_inode), 0,
+                                          SLAB_HWCACHE_ALIGN, NULL);
+       if (pcc_inode_slab == NULL)
+               GOTO(out_cache, rc = -ENOMEM);
+
        rc = llite_tunables_register();
        if (rc)
                GOTO(out_cache, rc);
@@ -163,6 +163,7 @@ out_tunables:
 out_cache:
        kmem_cache_destroy(ll_inode_cachep);
        kmem_cache_destroy(ll_file_data_slab);
+       kmem_cache_destroy(pcc_inode_slab);
        return rc;
 }
 
@@ -177,8 +178,15 @@ static void __exit lustre_exit(void)
        cl_env_put(cl_inode_fini_env, &cl_inode_fini_refcheck);
        vvp_global_fini();
 
+       /*
+        * Make sure all delayed rcu free inodes are flushed before we
+        * destroy cache.
+        */
+       rcu_barrier();
+
        kmem_cache_destroy(ll_inode_cachep);
        kmem_cache_destroy(ll_file_data_slab);
+       kmem_cache_destroy(pcc_inode_slab);
 }
 
 MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");