projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.5' into collectd-5.6
[collectd.git]
/
src
/
df.c
diff --git
a/src/df.c
b/src/df.c
index
ef9e413
..
4a86799
100644
(file)
--- a/
src/df.c
+++ b/
src/df.c
@@
-22,9
+22,9
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "common.h"
#include "plugin.h"
-#include "configfile.h"
#include "utils_mount.h"
#include "utils_ignorelist.h"
#include "utils_mount.h"
#include "utils_ignorelist.h"
@@
-53,7
+53,6
@@
static const char *config_keys[] =
"FSType",
"IgnoreSelected",
"ReportByDevice",
"FSType",
"IgnoreSelected",
"ReportByDevice",
- "ReportReserved",
"ReportInodes",
"ValuesAbsolute",
"ValuesPercentage"
"ReportInodes",
"ValuesAbsolute",
"ValuesPercentage"
@@
-191,7
+190,6
@@
static int df_read (void)
#endif
/* struct STATANYFS statbuf; */
cu_mount_t *mnt_list;
#endif
/* struct STATANYFS statbuf; */
cu_mount_t *mnt_list;
- cu_mount_t *mnt_ptr;
mnt_list = NULL;
if (cu_mount_getlist (&mnt_list) == NULL)
mnt_list = NULL;
if (cu_mount_getlist (&mnt_list) == NULL)
@@
-200,7
+198,7
@@
static int df_read (void)
return (-1);
}
return (-1);
}
- for (mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
+ for (
cu_mount_t *
mnt_ptr = mnt_list; mnt_ptr != NULL; mnt_ptr = mnt_ptr->next)
{
unsigned long long blocksize;
char disk_name[256];
{
unsigned long long blocksize;
char disk_name[256];
@@
-271,19
+269,15
@@
static int df_read (void)
else
{
if (strcmp (mnt_ptr->dir, "/") == 0)
else
{
if (strcmp (mnt_ptr->dir, "/") == 0)
- {
- if (strcmp (mnt_ptr->type, "rootfs") == 0)
- continue;
sstrncpy (disk_name, "root", sizeof (disk_name));
sstrncpy (disk_name, "root", sizeof (disk_name));
- }
else
{
else
{
- int
i,
len;
+ int len;
sstrncpy (disk_name, mnt_ptr->dir + 1, sizeof (disk_name));
len = strlen (disk_name);
sstrncpy (disk_name, mnt_ptr->dir + 1, sizeof (disk_name));
len = strlen (disk_name);
- for (i = 0; i < len; i++)
+ for (i
nt i
= 0; i < len; i++)
if (disk_name[i] == '/')
disk_name[i] = '-';
}
if (disk_name[i] == '/')
disk_name[i] = '-';
}