LU-56 libcfs: implementation of cpu partition

[fs/lustre-release.git] / libcfs / libcfs / module.c

diff --git a/libcfs/libcfs/module.c b/libcfs/libcfs/module.c
index 8278b4c..757723e 100644 (file)
--- a/libcfs/libcfs/module.c
+++ b/libcfs/libcfs/module.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.
@@ -332,7 +330,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a
 {
         char    *buf;
         struct libcfs_ioctl_data *data;
-        int err;
+        int err = 0;
         ENTRY;
 
         LIBCFS_ALLOC_GFP(buf, 1024, CFS_ALLOC_STD);
@@ -370,7 +368,7 @@ MODULE_LICENSE("GPL");
 
 extern cfs_psdev_t libcfs_dev;
 extern cfs_rw_semaphore_t cfs_tracefile_sem;
-extern cfs_semaphore_t cfs_trace_thread_sem;
+extern cfs_mutex_t cfs_trace_thread_mutex;
 
 extern void libcfs_init_nidstrings(void);
 extern int libcfs_arch_init(void);
@@ -383,7 +381,7 @@ static int init_libcfs_module(void)
         libcfs_arch_init();
         libcfs_init_nidstrings();
         cfs_init_rwsem(&cfs_tracefile_sem);
-        cfs_init_mutex(&cfs_trace_thread_sem);
+        cfs_mutex_init(&cfs_trace_thread_mutex);
         cfs_init_rwsem(&ioctl_list_sem);
         CFS_INIT_LIST_HEAD(&ioctl_list);
         cfs_waitq_init(&cfs_race_waitq);
@@ -394,6 +392,10 @@ static int init_libcfs_module(void)
                 return (rc);
         }
 
+       rc = cfs_cpu_init();
+       if (rc != 0)
+               goto cleanup_debug;
+
 #if LWT_SUPPORT
         rc = lwt_init();
         if (rc != 0) {
@@ -429,8 +431,8 @@ static int init_libcfs_module(void)
  cleanup_lwt:
 #if LWT_SUPPORT
         lwt_fini();
- cleanup_debug:
 #endif
+ cleanup_debug:
         libcfs_debug_cleanup();
         return rc;
 }
@@ -452,6 +454,7 @@ static void exit_libcfs_module(void)
 #if LWT_SUPPORT
         lwt_fini();
 #endif
+       cfs_cpu_fini();
 
         if (cfs_atomic_read(&libcfs_kmemory) != 0)
                 CERROR("Portals memory leaked: %d bytes\n",