X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fsuper25.c;h=e56d77387d09994370b16c4346b01a1555cd4399;hb=46dcacd1f77e0d70727c3ef601f58f9f6cf0af46;hp=9e9c83e2cbd1e5d2319d2016d534ceb71eddc36e;hpb=7a7e17d4db28fac1ca4bc333d60cbeb8dbc530d6;p=fs%2Flustre-release.git

diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index 9e9c83e..e56d773 100644
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -27,28 +27,14 @@
 #include <linux/types.h>
 #include <linux/random.h>
 #include <linux/version.h>
-#include <linux/lustre_lite.h>
-#include <linux/lustre_ha.h>
-#include <linux/lustre_dlm.h>
+#include <lustre_lite.h>
+#include <lustre_ha.h>
+#include <lustre_dlm.h>
 #include <linux/init.h>
 #include <linux/fs.h>
-#include <linux/lprocfs_status.h>
+#include <lprocfs_status.h>
 #include "llite_internal.h"
 
-struct super_block * ll_get_sb(struct file_system_type *fs_type,
-                               int flags, const char *devname, void * data)
-{
-        /* calls back in fill super */
-        return get_sb_nodev(fs_type, flags, data, ll_fill_super);
-}
-
-struct super_block * lustre_get_sb(struct file_system_type *fs_type,
-                               int flags, const char *devname, void * data)
-{
-        /* calls back in fill super */
-        return get_sb_nodev(fs_type, flags, data, lustre_fill_super);
-}
-
 static kmem_cache_t *ll_inode_cachep;
 
 static struct inode *ll_alloc_inode(struct super_block *sb)
@@ -93,40 +79,38 @@ int ll_init_inodecache(void)
 
 void ll_destroy_inodecache(void)
 {
-        if (kmem_cache_destroy(ll_inode_cachep))
-                CERROR("ll_inode_cache: not all structures were freed\n");
+#ifdef HAVE_KMEM_CACHE_DESTROY_INT
+        int rc;
+ 
+        rc = kmem_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 */
 struct super_operations lustre_super_operations =
 {
-        .alloc_inode = ll_alloc_inode,
+        .alloc_inode   = ll_alloc_inode,
         .destroy_inode = ll_destroy_inode,
-        .clear_inode = ll_clear_inode,
-        .put_super = lustre_put_super,
-        .statfs = ll_statfs,
-        .umount_begin = ll_umount_begin
+        .clear_inode   = ll_clear_inode,
+        .put_super     = ll_put_super,
+        .statfs        = ll_statfs,
+        .umount_begin  = ll_umount_begin,
+        .remount_fs    = ll_remount_fs,
 };
 
 
-struct file_system_type lustre_lite_fs_type = {
-        .owner  = THIS_MODULE,
-        .name =   "lustre_lite",
-        .get_sb = ll_get_sb,
-        .kill_sb = kill_anon_super,
-};
-
-struct file_system_type lustre_fs_type = {
-        .owner  = THIS_MODULE,
-        .name =   "lustre",
-        .get_sb = lustre_get_sb,
-        .kill_sb = kill_anon_super,
-};
+void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg));
 
 static int __init init_lustre_lite(void)
 {
-        int rc;
-        printk(KERN_INFO "Lustre: Lustre Lite Client File System; "
+        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)
@@ -142,25 +126,59 @@ static int __init init_lustre_lite(void)
         proc_lustre_fs_root = proc_lustre_root ?
                               proc_mkdir("llite", proc_lustre_root) : NULL;
 
-        rc = register_filesystem(&lustre_lite_fs_type);
-        if (!rc) {
-                rc = register_filesystem(&lustre_fs_type);
-                if (rc)
-                        unregister_filesystem(&lustre_fs_type);
+        ll_register_cache(&ll_cache_definition);
+
+        lustre_register_client_fill_super(ll_fill_super);
+        lustre_register_client_process_config(ll_process_config);
+
+        ll_get_random_bytes(seed, sizeof(seed));
+
+        /* Nodes with small feet have little entropy
+         * the NID for this node gives the most entropy in the low bits */
+        for (i=0; ; i++) {
+                if (LNetGetId(i, &lnet_id) == -ENOENT) {
+                        break;
+                }
+                if (LNET_NETTYP(LNET_NIDNET(lnet_id.nid)) != LOLND) {
+                        seed[0] ^= LNET_NIDADDR(lnet_id.nid);
+                }
         }
+
+        do_gettimeofday(&tv);
+        ll_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+
         return rc;
 }
 
 static void __exit exit_lustre_lite(void)
 {
-        unregister_filesystem(&lustre_fs_type);
-        unregister_filesystem(&lustre_lite_fs_type);
+#ifdef HAVE_KMEM_CACHE_DESTROY_INT
+        int rc;
+#endif
+
+        lustre_register_client_fill_super(NULL);
+        lustre_register_client_process_config(NULL);
+
+        ll_unregister_cache(&ll_cache_definition);
+
         ll_destroy_inodecache();
+#ifdef HAVE_KMEM_CACHE_DESTROY_INT
+        rc = kmem_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);
-        if (proc_lustre_fs_root) {
-                lprocfs_remove(proc_lustre_fs_root);
-                proc_lustre_fs_root = NULL;
+#endif
+        if (ll_async_page_slab) {
+#ifdef HAVE_KMEM_CACHE_DESTROY_INT
+                rc = kmem_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) 
+                lprocfs_remove(&proc_lustre_fs_root);
 }
 
 MODULE_AUTHOR("Cluster File Systems, Inc. <info@clusterfs.com>");