LU-1405 osd: Kernel panic when running sanityn test_12

[fs/lustre-release.git] / lustre / obdclass / linux / linux-sysctl.c

diff --git a/lustre/obdclass/linux/linux-sysctl.c b/lustre/obdclass/linux/linux-sysctl.c
index 4f10cdb..b7e14b7 100644 (file)
--- a/lustre/obdclass/linux/linux-sysctl.c
+++ b/lustre/obdclass/linux/linux-sysctl.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.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -35,7 +35,6 @@
  */
 
 #include <linux/module.h>
-#include <linux/autoconf.h>
 #include <linux/sysctl.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -54,16 +53,16 @@
 #include <obd_support.h>
 #include <lprocfs_status.h>
 
+#ifdef CONFIG_SYSCTL
 cfs_sysctl_table_header_t *obd_table_header = NULL;
+#endif
 
 #ifndef HAVE_SYSCTL_UNNUMBERED
 
 #define OBD_SYSCTL 300
 
 enum {
-        OBD_FAIL_LOC = 1,       /* control test failures instrumentation */
-        OBD_FAIL_VAL,           /* userdata for fail loc */
-        OBD_TIMEOUT,            /* RPC timeout before recovery/intr */
+        OBD_TIMEOUT = 3,        /* RPC timeout before recovery/intr */
         OBD_DUMP_ON_TIMEOUT,    /* dump kernel debug log upon eviction */
         OBD_MEMUSED,            /* bytes currently OBD_ALLOCated */
         OBD_PAGESUSED,          /* pages currently OBD_PAGE_ALLOCated */
@@ -108,18 +107,6 @@ enum {
 
 #endif
 
-
-int LL_PROC_PROTO(proc_fail_loc)
-{
-        int rc;
-        long old_fail_loc = obd_fail_loc;
-
-        rc = ll_proc_dolongvec(table, write, filp, buffer, lenp, ppos);
-        if (old_fail_loc != obd_fail_loc)
-                cfs_waitq_signal(&obd_race_waitq);
-        return rc;
-}
-
 int LL_PROC_PROTO(proc_set_timeout)
 {
         int rc;
@@ -322,25 +309,10 @@ int LL_PROC_PROTO(proc_at_history)
         return ll_proc_dointvec(table, write, filp, buffer, lenp, ppos);
 }
 
+#ifdef CONFIG_SYSCTL
 static cfs_sysctl_table_t obd_table[] = {
         {
-                .ctl_name = OBD_FAIL_LOC,
-                .procname = "fail_loc",
-                .data     = &obd_fail_loc,
-                .maxlen   = sizeof(obd_fail_loc),
-                .mode     = 0644,
-                .proc_handler = &proc_fail_loc
-        },
-        {
-                .ctl_name = OBD_FAIL_VAL,
-                .procname = "fail_val",
-                .data     = &obd_fail_val,
-                .maxlen   = sizeof(int),
-                .mode     = 0644,
-                .proc_handler = &proc_dointvec
-        },
-        {
-                .ctl_name = OBD_TIMEOUT,
+                INIT_CTL_NAME(OBD_TIMEOUT)
                 .procname = "timeout",
                 .data     = &obd_timeout,
                 .maxlen   = sizeof(int),
@@ -348,7 +320,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_set_timeout
         },
         {
-                .ctl_name = OBD_DEBUG_PEER_ON_TIMEOUT,
+                INIT_CTL_NAME(OBD_DEBUG_PEER_ON_TIMEOUT)
                 .procname = "debug_peer_on_timeout",
                 .data     = &obd_debug_peer_on_timeout,
                 .maxlen   = sizeof(int),
@@ -356,7 +328,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = OBD_DUMP_ON_TIMEOUT,
+                INIT_CTL_NAME(OBD_DUMP_ON_TIMEOUT)
                 .procname = "dump_on_timeout",
                 .data     = &obd_dump_on_timeout,
                 .maxlen   = sizeof(int),
@@ -364,7 +336,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = OBD_DUMP_ON_EVICTION,
+                INIT_CTL_NAME(OBD_DUMP_ON_EVICTION)
                 .procname = "dump_on_eviction",
                 .data     = &obd_dump_on_eviction,
                 .maxlen   = sizeof(int),
@@ -372,7 +344,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_dointvec
         },
         {
-                .ctl_name = OBD_MEMUSED,
+                INIT_CTL_NAME(OBD_MEMUSED)
                 .procname = "memused",
                 .data     = NULL,
                 .maxlen   = 0,
@@ -380,7 +352,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_memory_alloc
         },
         {
-                .ctl_name = OBD_PAGESUSED,
+                INIT_CTL_NAME(OBD_PAGESUSED)
                 .procname = "pagesused",
                 .data     = NULL,
                 .maxlen   = 0,
@@ -388,7 +360,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_pages_alloc
         },
         {
-                .ctl_name = OBD_MAXMEMUSED,
+                INIT_CTL_NAME(OBD_MAXMEMUSED)
                 .procname = "memused_max",
                 .data     = NULL,
                 .maxlen   = 0,
@@ -396,7 +368,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_mem_max
         },
         {
-                .ctl_name = OBD_MAXPAGESUSED,
+                INIT_CTL_NAME(OBD_MAXPAGESUSED)
                 .procname = "pagesused_max",
                 .data     = NULL,
                 .maxlen   = 0,
@@ -404,7 +376,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_pages_max
         },
         {
-                .ctl_name = OBD_LDLM_TIMEOUT,
+                INIT_CTL_NAME(OBD_LDLM_TIMEOUT)
                 .procname = "ldlm_timeout",
                 .data     = &ldlm_timeout,
                 .maxlen   = sizeof(int),
@@ -413,7 +385,7 @@ static cfs_sysctl_table_t obd_table[] = {
         },
 #ifdef RANDOM_FAIL_ALLOC
         {
-                .ctl_name = OBD_ALLOC_FAIL_RATE,
+                INIT_CTL_NAME(OBD_ALLOC_FAIL_RATE)
                 .procname = "alloc_fail_rate",
                 .data     = &obd_alloc_fail_rate,
                 .maxlen   = sizeof(int),
@@ -422,7 +394,7 @@ static cfs_sysctl_table_t obd_table[] = {
         },
 #endif
         {
-                .ctl_name = OBD_MAX_DIRTY_PAGES,
+                INIT_CTL_NAME(OBD_MAX_DIRTY_PAGES)
                 .procname = "max_dirty_mb",
                 .data     = &obd_max_dirty_pages,
                 .maxlen   = sizeof(int),
@@ -430,7 +402,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_max_dirty_pages_in_mb
         },
         {
-                .ctl_name = OBD_AT_MIN,
+                INIT_CTL_NAME(OBD_AT_MIN)
                 .procname = "at_min",
                 .data     = &at_min,
                 .maxlen   = sizeof(int),
@@ -438,7 +410,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_at_min
         },
         {
-                .ctl_name = OBD_AT_MAX,
+                INIT_CTL_NAME(OBD_AT_MAX)
                 .procname = "at_max",
                 .data     = &at_max,
                 .maxlen   = sizeof(int),
@@ -446,7 +418,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_at_max
         },
         {
-                .ctl_name = OBD_AT_EXTRA,
+                INIT_CTL_NAME(OBD_AT_EXTRA)
                 .procname = "at_extra",
                 .data     = &at_extra,
                 .maxlen   = sizeof(int),
@@ -454,7 +426,7 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_at_extra
         },
         {
-                .ctl_name = OBD_AT_EARLY_MARGIN,
+                INIT_CTL_NAME(OBD_AT_EARLY_MARGIN)
                 .procname = "at_early_margin",
                 .data     = &at_early_margin,
                 .maxlen   = sizeof(int),
@@ -462,27 +434,28 @@ static cfs_sysctl_table_t obd_table[] = {
                 .proc_handler = &proc_at_early_margin
         },
         {
-                .ctl_name = OBD_AT_HISTORY,
+                INIT_CTL_NAME(OBD_AT_HISTORY)
                 .procname = "at_history",
                 .data     = &at_history,
                 .maxlen   = sizeof(int),
                 .mode     = 0644,
                 .proc_handler = &proc_at_history
         },
-        { 0 }
+        {       INIT_CTL_NAME(0)    }
 };
 
 static cfs_sysctl_table_t parent_table[] = {
         {
-                .ctl_name = OBD_SYSCTL,
+                INIT_CTL_NAME(OBD_SYSCTL)
                 .procname = "lustre",
                 .data     = NULL,
                 .maxlen   = 0,
                 .mode     = 0555,
                 .child    = obd_table
         },
-        {0}
+        {       INIT_CTL_NAME(0)   }
 };
+#endif
 
 void obd_sysctl_init (void)
 {