LU-6031 test: Check server version in recovery-small test 10d

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

diff --git a/snmp/lustre-snmp-util.c b/snmp/lustre-snmp-util.c
index 61fbd2e..5f88c6a 100644 (file)
--- a/snmp/lustre-snmp-util.c
+++ b/snmp/lustre-snmp-util.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,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,9 +49,7 @@
  */ 
 
 #include <sys/types.h>
-#if defined (__linux__)
 #include <sys/vfs.h>
-#endif
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -296,8 +292,6 @@ void lustrefs_ctrl(int command)
 
 int get_sysstatus(void)
 {
-    FILE    *fptr = NULL;
-    int     len = 0;
     int     ret_val = ERROR ;
     char    sys_status[50] = {0};
     
@@ -542,9 +536,9 @@ unsigned char*
         size_t  *var_len)
 {
     static unsigned char string[SPRINT_MAX_LEN];
-    if( SUCCESS != read_string(file_path, string,sizeof(string)))
+    if( SUCCESS != read_string(file_path, (char *)string,sizeof(string)))
         return NULL;
-    *var_len = strlen(string);
+    *var_len = strlen((char *)string);
     return (unsigned char *) string;
 }
 
@@ -767,3 +761,12 @@ extern int mds_stats_values(char * name_value, unsigned long long * nb_sample, u
   
   return SUCCESS;
 }
+
+void convert_ull(counter64 *c64, unsigned long long ull, size_t *var_len)
+{
+       *var_len  = sizeof(*c64);
+        c64->low  = (unsigned long long) (0x0ffffffff & ull);
+        ull >>= 32;
+        c64->high = (unsigned long long) (0x0ffffffff & ull);
+}
+