Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6464 ldiskfs: 64bit pointers in ext4_map_inode_page()
[fs/lustre-release.git]
/
snmp
/
lustre-snmp-util.c
diff --git
a/snmp/lustre-snmp-util.c
b/snmp/lustre-snmp-util.c
index
73a40cd
..
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.
* 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
* 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
*
* 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
*/
/*
* 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.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-51,9
+49,7
@@
*/
#include <sys/types.h>
*/
#include <sys/types.h>
-#if defined (__linux__)
#include <sys/vfs.h>
#include <sys/vfs.h>
-#endif
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
#include <sys/stat.h>
#include <unistd.h>
@@
-296,8
+292,6
@@
void lustrefs_ctrl(int command)
int get_sysstatus(void)
{
int get_sysstatus(void)
{
- FILE *fptr = NULL;
- int len = 0;
int ret_val = ERROR ;
char sys_status[50] = {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];
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;
return NULL;
- *var_len = strlen(string);
+ *var_len = strlen(
(char *)
string);
return (unsigned 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;
}
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);
+}
+