Blame sysstat-9.0.6-nfs.patch
|
Ivana Varekova |
cb15beb |
diff -up sysstat-9.0.6/common.c.pom sysstat-9.0.6/common.c
|
|
Ivana Varekova |
cb15beb |
--- sysstat-9.0.6/common.c.pom 2009-09-12 20:59:04.000000000 +0200
|
|
Ivana Varekova |
cb15beb |
+++ sysstat-9.0.6/common.c 2009-12-11 11:20:41.000000000 +0100
|
|
Ivana Varekova |
cb15beb |
@@ -275,7 +275,6 @@ int get_nfs_mount_nr(void)
|
|
Ivana Varekova |
cb15beb |
{
|
|
Ivana Varekova |
cb15beb |
FILE *fp;
|
|
Ivana Varekova |
cb15beb |
char line[8192];
|
|
Ivana Varekova |
cb15beb |
- char type_name[10];
|
|
Ivana Varekova |
cb15beb |
unsigned int nfs = 0;
|
|
Ivana Varekova |
cb15beb |
|
|
Ivana Varekova |
cb15beb |
if ((fp = fopen(NFSMOUNTSTATS, "r")) == NULL)
|
|
Ivana Varekova |
cb15beb |
@@ -285,12 +284,9 @@ int get_nfs_mount_nr(void)
|
|
Ivana Varekova |
cb15beb |
while (fgets(line, 8192, fp) != NULL) {
|
|
Ivana Varekova |
cb15beb |
|
|
Ivana Varekova |
cb15beb |
if ((strstr(line, "mounted")) && (strstr(line, "on")) &&
|
|
Ivana Varekova |
cb15beb |
- (strstr(line, "with")) && (strstr(line, "fstype"))) {
|
|
Ivana Varekova |
cb15beb |
-
|
|
Ivana Varekova |
cb15beb |
- sscanf(strstr(line, "fstype") + 6, "%10s", type_name);
|
|
Ivana Varekova |
cb15beb |
- if ((!strncmp(type_name, "nfs", 3)) && (strncmp(type_name, "nfsd", 4))) {
|
|
Ivana Varekova |
cb15beb |
- nfs ++;
|
|
Ivana Varekova |
cb15beb |
- }
|
|
Ivana Varekova |
cb15beb |
+ (strstr(line, "with fstype nfs")) &&
|
|
Ivana Varekova |
cb15beb |
+ !(strstr(line, "with fstype nfsd"))) {
|
|
Ivana Varekova |
cb15beb |
+ nfs++;
|
|
Ivana Varekova |
cb15beb |
}
|
|
Ivana Varekova |
cb15beb |
}
|
|
Ivana Varekova |
cb15beb |
|