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-1187 osp: add osp_md_object for remote directory.
[fs/lustre-release.git]
/
snmp
/
lustre-snmp.c
diff --git
a/snmp/lustre-snmp.c
b/snmp/lustre-snmp.c
index
1a3039a
..
0473852
100644
(file)
--- a/
snmp/lustre-snmp.c
+++ b/
snmp/lustre-snmp.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.
@@
-26,8
+24,10
@@
* 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.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
/*
* This file is part of Lustre, http://www.lustre.org/
@@
-238,23
+238,23
@@
var_clusterFileSystems(struct variable *vp,
case SYSVERSION:
sprintf(file_path, "%s%s", LUSTRE_PATH,"version");
case SYSVERSION:
sprintf(file_path, "%s%s", LUSTRE_PATH,"version");
- 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;
case SYSKERNELVERSION:
sprintf(file_path, "%s%s", LUSTRE_PATH,"kernel_version");
return (unsigned char *) string;
case SYSKERNELVERSION:
sprintf(file_path, "%s%s", LUSTRE_PATH,"kernel_version");
- 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;
case SYSHEALTHCHECK:
sprintf(file_path, "%s%s", LUSTRE_PATH,FILENAME_SYSHEALTHCHECK);
return (unsigned char *) string;
case SYSHEALTHCHECK:
sprintf(file_path, "%s%s", LUSTRE_PATH,FILENAME_SYSHEALTHCHECK);
- 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;
case SYSSTATUS:
return (unsigned char *) string;
case SYSSTATUS:
@@
-573,8
+573,7
@@
write_sysStatus(int action,
size_t name_len)
{
static long *long_ret;
size_t name_len)
{
static long *long_ret;
- int size;
- int pid, new_value;
+ int new_value;
@@
-599,7
+598,6
@@
write_sysStatus(int action,
case RESERVE2:
case RESERVE2:
- size = var_val_len;
long_ret = (long *) var_val;
long_ret = (long *) var_val;