LU-5278 echo: request pages in batches

[fs/lustre-release.git] / snmp / lustre-snmp-trap.c

diff --git a/snmp/lustre-snmp-trap.c b/snmp/lustre-snmp-trap.c
index da082f6..ea09d9f 100644 (file)
--- a/snmp/lustre-snmp-trap.c
+++ b/snmp/lustre-snmp-trap.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.
@@ -16,8 +14,8 @@
  * 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 [sun.com URL with a
- * copy of GPLv2].
+ * 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
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -51,14 +49,13 @@
  */ 
 
 #include <sys/types.h>
-#if defined (__linux__)
 #include <sys/vfs.h>
-#endif
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <ctype.h>
 #include "lustre-snmp-util.h"
 
 /**************************************************************************
@@ -358,13 +355,14 @@ void send_portals_catastrophe_trap(char *reason_string)
      */
     var_trap[1].next_variable = NULL;
 
-    /*The "name" is the OID of the portals trap reason strong*/
+    /* The "name" is the OID of the portals trap reason string */
     var_trap[1].name = lustre_portals_trap_string;
     var_trap[1].name_length = sizeof(lustre_portals_trap_string) / sizeof(oid);
 
-    /*And the data is a octet string, that contains the actually reason string*/
+    /* And the data is an octet string, that contains the actually reason
+     * string */
     var_trap[1].type = ASN_OCTET_STR;
-    var_trap[1].val.string = reason_string;
+    var_trap[1].val.string = (unsigned char *)reason_string;
     var_trap[1].val_len = strlen(reason_string);
 
     /*And now send off the trap*/
@@ -413,28 +411,30 @@ void send_obd_unhealthy_trap(char *obd_name,char *reason_string)
      */
     var_trap[1].next_variable = &var_trap[2];;
 
-    /*The "name" is the OID of the portals trap reason strong*/
+    /* The "name" is the OID of the portals trap reason string */
     var_trap[1].name = lustre_unhealthy_trap_device_name_string;
     var_trap[1].name_length = sizeof(lustre_unhealthy_trap_device_name_string) / sizeof(oid);
 
-    /*And the data is a octet string, that contains the actually reason strong*/
+    /* And the data is an octet string, that contains the actual reason
+     * string */
     var_trap[1].type = ASN_OCTET_STR;
-    var_trap[1].val.string = obd_name;
+    var_trap[1].val.string = (unsigned char *)obd_name;
     var_trap[1].val_len = strlen(obd_name);
 
-    /* 
-     * Setup the third variable in the trap data. 
+    /*
+     * Setup the third variable in the trap data.
      * It is the last in the chain so set next to NULL
      */
     var_trap[2].next_variable = NULL;
 
-    /*The "name" is the OID of the portals trap reason strong*/
+    /* The "name" is the OID of the portals trap reason string */
     var_trap[2].name = lustre_unhealthy_trap_reason_string;
     var_trap[2].name_length = sizeof(lustre_unhealthy_trap_reason_string) / sizeof(oid);
 
-    /*And the data is a octet string, that contains the actually reason strong*/
+    /* And the data is an octet string, that contains the actual reason
+     * string */
     var_trap[2].type = ASN_OCTET_STR;
-    var_trap[2].val.string = reason_string;
+    var_trap[2].val.string = (unsigned char *)reason_string;
     var_trap[2].val_len = strlen(reason_string);
 
     /*And now send off the trap*/