projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3353 from mrunge/master
[collectd.git]
/
src
/
nfs.c
diff --git
a/src/nfs.c
b/src/nfs.c
index
e1987f1
..
97d9125
100644
(file)
--- a/
src/nfs.c
+++ b/
src/nfs.c
@@
-24,8
+24,8
@@
#include "collectd.h"
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#if HAVE_KSTAT_H
#include <kstat.h>
#if HAVE_KSTAT_H
#include <kstat.h>
@@
-322,7
+322,7
@@
static int nfs_config(const char *key, const char *value) {
#if KERNEL_LINUX
static int nfs_init(void) { return 0; }
#if KERNEL_LINUX
static int nfs_init(void) { return 0; }
-/* #endif KERNEL_LINUX */
+
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKSTAT
static int nfs_init(void) {
#elif HAVE_LIBKSTAT
static int nfs_init(void) {
@@
-519,7
+519,8
@@
static int nfs_submit_nfs4_client(const char *instance, char **fields,
static void nfs_read_linux(FILE *fh, const char *inst) {
char buffer[1024];
static void nfs_read_linux(FILE *fh, const char *inst) {
char buffer[1024];
- char *fields[64];
+ // The stats line is prefixed with type and number of fields, thus plus 2
+ char *fields[MAX(NFS4_SERVER_MAX_PROC, NFS4_CLIENT_MAX_PROC) + 2];
int fields_num = 0;
if (fh == NULL)
int fields_num = 0;
if (fh == NULL)
@@
-593,7
+594,7
@@
static int nfs_read(void) {
return 0;
}
return 0;
}
-/* #endif KERNEL_LINUX */
+
/* #endif KERNEL_LINUX */
#elif HAVE_LIBKSTAT
static int nfs_read(void) {
#elif HAVE_LIBKSTAT
static int nfs_read(void) {