LU-3409 llite: silence lockdep warning in ll_md_blocking_ast

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

diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index 979f0c4..90949ff 100644 (file)
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -38,7 +38,6 @@
 
 #include <linux/module.h>
 #include <linux/types.h>
-#include <linux/random.h>
 #include <linux/version.h>
 #include <lustre_lite.h>
 #include <lustre_ha.h>
@@ -54,13 +53,11 @@ static struct inode *ll_alloc_inode(struct super_block *sb)
 {
         struct ll_inode_info *lli;
         ll_stats_ops_tally(ll_s2sbi(sb), LPROC_LL_ALLOC_INODE, 1);
-        OBD_SLAB_ALLOC_PTR(lli, ll_inode_cachep);
+        OBD_SLAB_ALLOC_PTR_GFP(lli, ll_inode_cachep, CFS_ALLOC_IO);
         if (lli == NULL)
                 return NULL;
 
         inode_init_once(&lli->lli_vfs_inode);
-        ll_lli_init(lli);
-
         return &lli->lli_vfs_inode;
 }
 
@@ -74,7 +71,7 @@ int ll_init_inodecache(void)
 {
         ll_inode_cachep = cfs_mem_cache_create("lustre_inode_cache",
                                                sizeof(struct ll_inode_info),
-                                               0, SLAB_HWCACHE_ALIGN);
+                                               0, CFS_SLAB_HWCACHE_ALIGN);
         if (ll_inode_cachep == NULL)
                 return -ENOMEM;
         return 0;
@@ -93,8 +90,12 @@ 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,
@@ -105,18 +106,29 @@ struct super_operations lustre_super_operations =
 
 void lustre_register_client_process_config(int (*cpc)(struct lustre_cfg *lcfg));
 
+int vvp_global_init(void);
+void vvp_global_fini(void);
+
 static int __init init_lustre_lite(void)
 {
-        int i, rc, seed[2];
-        struct timeval tv;
-        lnet_process_id_t lnet_id;
- 
+       int i, rc, seed[2];
+       struct timeval tv;
+       lnet_process_id_t lnet_id;
+
+       CLASSERT(sizeof(LUSTRE_VOLATILE_HDR) == LUSTRE_VOLATILE_HDR_LEN + 1);
+
+       /* print an address of _any_ initialized kernel symbol from this
+        * module, to allow debugging with gdb that doesn't support data
+        * symbols from modules.*/
+       CDEBUG(D_INFO, "Lustre client module (%p).\n",
+              &lustre_super_operations);
+
         rc = ll_init_inodecache();
         if (rc)
                 return -ENOMEM;
         ll_file_data_slab = cfs_mem_cache_create("ll_file_data",
                                                  sizeof(struct ll_file_data), 0,
-                                                 SLAB_HWCACHE_ALIGN);
+                                                 CFS_SLAB_HWCACHE_ALIGN);
         if (ll_file_data_slab == NULL) {
                 ll_destroy_inodecache();
                 return -ENOMEM;
@@ -134,7 +146,7 @@ static int __init init_lustre_lite(void)
 
         ll_rmtperm_hash_cachep = cfs_mem_cache_create("ll_rmtperm_hash_cache",
                                                    REMOTE_PERM_HASHSIZE *
-                                                   sizeof(struct list_head),
+                                                   sizeof(cfs_list_t),
                                                    0, 0);
         if (ll_rmtperm_hash_cachep == NULL) {
                 cfs_mem_cache_destroy(ll_remote_perm_cachep);
@@ -148,14 +160,12 @@ static int __init init_lustre_lite(void)
         proc_lustre_fs_root = proc_lustre_root ?
                               lprocfs_register("llite", proc_lustre_root, NULL, NULL) : NULL;
 
-        ll_register_cache(&ll_cache_definition);
-
         lustre_register_client_fill_super(ll_fill_super);
         lustre_register_kill_super_cb(ll_kill_super);
 
         lustre_register_client_process_config(ll_process_config);
 
-        ll_get_random_bytes(seed, sizeof(seed));
+        cfs_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 */
@@ -168,19 +178,26 @@ static int __init init_lustre_lite(void)
                 }
         }
 
-        do_gettimeofday(&tv);
-        ll_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+        cfs_gettimeofday(&tv);
+        cfs_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();
+        /*
+         * XXX normal cleanup is needed here.
+         */
+        if (rc == 0)
+                rc = vvp_global_init();
+
         return rc;
 }
 
 static void __exit exit_lustre_lite(void)
 {
         int rc;
-        
+
+        vvp_global_fini();
         del_timer(&ll_capa_timer);
         ll_capa_thread_stop();
         LASSERTF(capa_count[CAPA_SITE_CLIENT] == 0,
@@ -192,8 +209,6 @@ static void __exit exit_lustre_lite(void)
 
         lustre_register_client_process_config(NULL);
 
-        ll_unregister_cache(&ll_cache_definition);
-
         ll_destroy_inodecache();
 
         rc = cfs_mem_cache_destroy(ll_rmtperm_hash_cachep);
@@ -206,11 +221,6 @@ static void __exit exit_lustre_lite(void)
 
         rc = cfs_mem_cache_destroy(ll_file_data_slab);
         LASSERTF(rc == 0, "couldn't destroy ll_file_data slab\n");
-        if (ll_async_page_slab) {
-                rc = cfs_mem_cache_destroy(ll_async_page_slab);
-                LASSERTF(rc == 0, "couldn't destroy ll_async_page slab\n");
-        }
-
         if (proc_lustre_fs_root)
                 lprocfs_remove(&proc_lustre_fs_root);
 }