Whamcloud - gitweb
LU-2444 build: fix 'error handling' issues
[fs/lustre-release.git] / lustre / obdclass / darwin / darwin-sysctl.c
index 019fff3..929407f 100644 (file)
@@ -1,3 +1,37 @@
+/*
+ * GPL HEADER START
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
+ */
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
@@ -6,7 +40,7 @@
 #include <sys/proc.h>
 #include <sys/unistd.h>
 #include <mach/mach_types.h>
-#include <linux/lustre_build_version.h>
+#include <lustre/lustre_build_version.h>
 
 #define DEBUG_SUBSYSTEM S_CLASS
                                                                                                                                                                      
 #ifndef BUILD_VERSION  
 #define BUILD_VERSION          "Unknown"
 #endif
-#ifndef LUSTRE_KERNEL_VERSION
-#define LUSTRE_KERNEL_VERSION  "Unknown Darwin version"
-#endif
 
 cfs_sysctl_table_header_t *obd_table_header = NULL;
 
-int proc_fail_loc SYSCTL_HANDLER_ARGS;
 int proc_obd_timeout SYSCTL_HANDLER_ARGS;
-extern unsigned int obd_fail_loc;
 extern unsigned int obd_dump_on_timeout;
 extern unsigned int obd_timeout;
 extern unsigned int ldlm_timeout;
@@ -30,28 +59,21 @@ extern unsigned int obd_sync_filter;
 extern atomic_t obd_memory;
 
 int read_build_version SYSCTL_HANDLER_ARGS;
-int read_lustre_kernel_version SYSCTL_HANDLER_ARGS;
 
 SYSCTL_NODE (,                  OID_AUTO,       lustre,            CTLFLAG_RW,
             0,                 "lustre sysctl top");
-SYSCTL_PROC(_lustre,           OID_AUTO,       fail_loc, 
-           CTLTYPE_INT | CTLFLAG_RW ,          &obd_fail_loc,
-           0,          &proc_fail_loc,         "I",    "obd_fail_loc");
 SYSCTL_PROC(_lustre,           OID_AUTO,       timeout, 
            CTLTYPE_INT | CTLFLAG_RW ,          &obd_timeout,
            0,          &proc_obd_timeout,      "I",    "obd_timeout");
 SYSCTL_PROC(_lustre,           OID_AUTO,       build_version, 
            CTLTYPE_STRING | CTLFLAG_RD ,       NULL,
            0,          &read_build_version,    "A",    "lustre_build_version");
-SYSCTL_PROC(_lustre,           OID_AUTO,       lustre_kernel_version,
-           CTLTYPE_STRING | CTLFLAG_RD ,       NULL,
-           0,          &read_lustre_kernel_version,    "A",    "lustre_build_version");
 SYSCTL_INT(_lustre,            OID_AUTO,       dump_on_timeout, 
           CTLTYPE_INT | CTLFLAG_RW,            &obd_dump_on_timeout,
           0,           "lustre_dump_on_timeout");
 SYSCTL_INT(_lustre,            OID_AUTO,       debug_peer_on_timeout, 
           CTLTYPE_INT | CTLFLAG_RW,            &obd_debug_peer_on_timeout,
-          0,           "lustre_dump_on_timeout");
+          0,           "lustre_debug_peer_on_timeout");
 SYSCTL_INT(_lustre,            OID_AUTO,       memused, 
           CTLTYPE_INT | CTLFLAG_RW,            (int *)&obd_memory.counter,
           0,           "lustre_memory_used");
@@ -61,37 +83,15 @@ SYSCTL_INT(_lustre,         OID_AUTO,       ldlm_timeout,
 
 static cfs_sysctl_table_t      parent_table[] = {
        &sysctl__lustre,
-       &sysctl__lustre_fail_loc,
        &sysctl__lustre_timeout,
        &sysctl__lustre_dump_on_timeout,
-       &sysctl__lustre_debug_peer_on_timeout,
+        &sysctl__lustre_debug_peer_on_timeout,
        &sysctl__lustre_upcall,
        &sysctl__lustre_memused,
        &sysctl__lustre_filter_sync_on_commit,
        &sysctl__lustre_ldlm_timeout,
 };
 
-extern cfs_waitq_t obd_race_waitq;
-
-int proc_fail_loc SYSCTL_HANDLER_ARGS
-{ 
-       int error = 0; 
-       int old_fail_loc = obd_fail_loc;
-       
-       error = sysctl_handle_long(oidp, oidp->oid_arg1, oidp->oid_arg2, req); 
-       if (!error && req->newptr != USER_ADDR_NULL) {
-               if (old_fail_loc != obd_fail_loc) 
-                       cfs_waitq_signal(&obd_race_waitq);
-       } else  if (req->newptr != USER_ADDR_NULL) { 
-               /* Something was wrong with the write request */ 
-               printf ("sysctl fail loc fault: %d.\n", error);
-       } else { 
-               /* Read request */ 
-               error = SYSCTL_OUT(req, &obd_fail_loc, sizeof obd_fail_loc);
-       }
-       return error;
-}
-
 int proc_obd_timeout SYSCTL_HANDLER_ARGS
 { 
        int error = 0;
@@ -122,19 +122,6 @@ int read_build_version SYSCTL_HANDLER_ARGS
        return error;
 }
 
-int read_lustre_kernel_version SYSCTL_HANDLER_ARGS
-{
-       int error = 0;
-
-       error = sysctl_handle_long(oidp, oidp->oid_arg1, oidp->oid_arg2, req); 
-       if ( req->newptr != NULL) {
-               printf("sysctl lustre_kernel_version is read-only!\n");
-       } else {
-               error = SYSCTL_OUT(req, LUSTRE_KERNEL_VERSION, strlen(LUSTRE_KERNEL_VERSION));
-       }
-       return error;
-}
-
 void obd_sysctl_init (void)
 {
 #if 1 
@@ -151,4 +138,3 @@ void obd_sysctl_clean (void)
        obd_table_header = NULL;
 #endif
 }
-