Branch Head

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

diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index e56d773..ea1564c 100644 (file)
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -35,13 +35,13 @@
 #include <lprocfs_status.h>
 #include "llite_internal.h"
 
-static kmem_cache_t *ll_inode_cachep;
+static cfs_mem_cache_t *ll_inode_cachep;
 
 static struct inode *ll_alloc_inode(struct super_block *sb)
 {
         struct ll_inode_info *lli;
-        lprocfs_counter_incr((ll_s2sbi(sb))->ll_stats, LPROC_LL_ALLOC_INODE);
-        OBD_SLAB_ALLOC(lli, ll_inode_cachep, SLAB_KERNEL, sizeof *lli);
+        ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_ALLOC_INODE, 1);
+        OBD_SLAB_ALLOC_PTR(lli, ll_inode_cachep);
         if (lli == NULL)
                 return NULL;
 
@@ -54,24 +54,14 @@ static struct inode *ll_alloc_inode(struct super_block *sb)
 static void ll_destroy_inode(struct inode *inode)
 {
         struct ll_inode_info *ptr = ll_i2info(inode);
-        OBD_SLAB_FREE(ptr, ll_inode_cachep, sizeof(*ptr));
-}
-
-static void init_once(void * foo, kmem_cache_t * cachep, unsigned long flags)
-{
-        struct ll_inode_info *lli = foo;
-
-        if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) ==
-            SLAB_CTOR_CONSTRUCTOR)
-                inode_init_once(&lli->lli_vfs_inode);
+        OBD_SLAB_FREE_PTR(ptr, ll_inode_cachep);
 }
 
 int ll_init_inodecache(void)
 {
-        ll_inode_cachep = kmem_cache_create("lustre_inode_cache",
-                                            sizeof(struct ll_inode_info),
-                                            0, SLAB_HWCACHE_ALIGN,
-                                            init_once, NULL);
+        ll_inode_cachep = cfs_mem_cache_create("lustre_inode_cache",
+                                                 sizeof(struct ll_inode_info),
+                                                 0, SLAB_HWCACHE_ALIGN);
         if (ll_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
@@ -79,14 +69,10 @@ int ll_init_inodecache(void)
 
 void ll_destroy_inodecache(void)
 {
-#ifdef HAVE_KMEM_CACHE_DESTROY_INT
         int rc;
- 
-        rc = kmem_cache_destroy(ll_inode_cachep);
+
+        rc = cfs_mem_cache_destroy(ll_inode_cachep);
         LASSERTF(rc == 0, "ll_inode_cache: not all structures were freed\n");
-#else
-        kmem_cache_destroy(ll_inode_cachep);
-#endif
 }
 
 /* exported operations */
@@ -95,6 +81,7 @@ struct super_operations lustre_super_operations =
         .alloc_inode   = ll_alloc_inode,
         .destroy_inode = ll_destroy_inode,
         .clear_inode   = ll_clear_inode,
+        .delete_inode  = ll_delete_inode,
         .put_super     = ll_put_super,
         .statfs        = ll_statfs,
         .umount_begin  = ll_umount_begin,
@@ -109,20 +96,42 @@ static int __init init_lustre_lite(void)
         int i, rc, seed[2];
         struct timeval tv;
         lnet_process_id_t lnet_id;
-
-        printk(KERN_INFO "Lustre: Lustre Client File System; "
-               "info@clusterfs.com\n");
+ 
         rc = ll_init_inodecache();
         if (rc)
                 return -ENOMEM;
-        ll_file_data_slab = kmem_cache_create("ll_file_data",
+
+        ll_file_data_slab = cfs_mem_cache_create("ll_file_data",
                                               sizeof(struct ll_file_data), 0,
-                                              SLAB_HWCACHE_ALIGN, NULL, NULL);
+                                                  SLAB_HWCACHE_ALIGN);
         if (ll_file_data_slab == NULL) {
                 ll_destroy_inodecache();
                 return -ENOMEM;
         }
 
+        ll_remote_perm_cachep = cfs_mem_cache_create("ll_remote_perm_cache",
+                                                  sizeof(struct ll_remote_perm),
+                                                      0, 0);
+        if (ll_remote_perm_cachep == NULL) {
+                cfs_mem_cache_destroy(ll_file_data_slab);
+                ll_file_data_slab = NULL;
+                ll_destroy_inodecache();
+                return -ENOMEM;
+        }
+
+        ll_rmtperm_hash_cachep = cfs_mem_cache_create("ll_rmtperm_hash_cache",
+                                                   REMOTE_PERM_HASHSIZE *
+                                                   sizeof(struct list_head),
+                                                   0, 0);
+        if (ll_rmtperm_hash_cachep == NULL) {
+                cfs_mem_cache_destroy(ll_remote_perm_cachep);
+                ll_remote_perm_cachep = NULL;
+                cfs_mem_cache_destroy(ll_file_data_slab);
+                ll_file_data_slab = NULL;
+                ll_destroy_inodecache();
+                return -ENOMEM;
+        }
+
         proc_lustre_fs_root = proc_lustre_root ?
                               proc_mkdir("llite", proc_lustre_root) : NULL;
 
@@ -147,6 +156,9 @@ static int __init init_lustre_lite(void)
         do_gettimeofday(&tv);
         ll_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
 
+        init_timer(&ll_capa_timer);
+        ll_capa_timer.function = ll_capa_timer_callback;
+        rc = ll_capa_thread_start();
         return rc;
 }
 
@@ -155,6 +167,11 @@ static void __exit exit_lustre_lite(void)
 #ifdef HAVE_KMEM_CACHE_DESTROY_INT
         int rc;
 #endif
+        del_timer(&ll_capa_timer);
+        ll_capa_thread_stop();
+        LASSERTF(capa_count[CAPA_SITE_CLIENT] == 0,
+                 "client remaining capa count %d\n",
+                 capa_count[CAPA_SITE_CLIENT]);
 
         lustre_register_client_fill_super(NULL);
         lustre_register_client_process_config(NULL);
@@ -162,23 +179,25 @@ static void __exit exit_lustre_lite(void)
         ll_unregister_cache(&ll_cache_definition);
 
         ll_destroy_inodecache();
-#ifdef HAVE_KMEM_CACHE_DESTROY_INT
-        rc = kmem_cache_destroy(ll_file_data_slab);
+
+        rc = cfs_mem_cache_destroy(ll_rmtperm_hash_cachep);
+        LASSERTF(rc == 0, "couldn't destroy ll_rmtperm_hash_cachep\n");
+        ll_rmtperm_hash_cachep = NULL;
+
+        rc = cfs_mem_cache_destroy(ll_remote_perm_cachep);
+        LASSERTF(rc == 0, "couldn't destroy ll_remote_perm_cachep\n");
+        ll_remote_perm_cachep = NULL;
+
+        rc = cfs_mem_cache_destroy(ll_file_data_slab);
         LASSERTF(rc == 0, "couldn't destroy ll_file_data slab\n");
-#else
-        kmem_cache_destroy(ll_file_data_slab);
-#endif
         if (ll_async_page_slab) {
-#ifdef HAVE_KMEM_CACHE_DESTROY_INT
-                rc = kmem_cache_destroy(ll_async_page_slab);
+                rc = cfs_mem_cache_destroy(ll_async_page_slab);
                 LASSERTF(rc == 0, "couldn't destroy ll_async_page slab\n");
-#else
-                kmem_cache_destroy(ll_async_page_slab);
-#endif
         }
 
-        if (proc_lustre_fs_root) 
+        if (proc_lustre_fs_root) {
                 lprocfs_remove(&proc_lustre_fs_root);
+        }
 }
 
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");