Blame sysstat-9.0.4-nfs.patch
|
Ivana Varekova |
0b25c18 |
diff -up sysstat-9.0.4/common.c.orig sysstat-9.0.4/common.c
|
|
Ivana Varekova |
0b25c18 |
--- sysstat-9.0.4/common.c.orig 2009-12-10 09:48:07.158258512 -0500
|
|
Ivana Varekova |
0b25c18 |
+++ sysstat-9.0.4/common.c 2009-12-10 09:49:32.888299550 -0500
|
|
Ivana Varekova |
0b25c18 |
@@ -275,7 +275,7 @@ int get_nfs_mount_nr(void)
|
|
Ivana Varekova |
0b25c18 |
{
|
|
Ivana Varekova |
0b25c18 |
FILE *fp;
|
|
Ivana Varekova |
0b25c18 |
char line[8192];
|
|
Ivana Varekova |
0b25c18 |
- char type_name[10];
|
|
Ivana Varekova |
0b25c18 |
+ char *type_name;
|
|
Ivana Varekova |
0b25c18 |
unsigned int nfs = 0;
|
|
Ivana Varekova |
0b25c18 |
|
|
Ivana Varekova |
0b25c18 |
if ((fp = fopen(NFSMOUNTSTATS, "r")) == NULL)
|
|
Ivana Varekova |
0b25c18 |
@@ -285,12 +285,9 @@ int get_nfs_mount_nr(void)
|
|
Ivana Varekova |
0b25c18 |
while (fgets(line, 8192, fp) != NULL) {
|
|
Ivana Varekova |
0b25c18 |
|
|
Ivana Varekova |
0b25c18 |
if ((strstr(line, "mounted")) && (strstr(line, "on")) &&
|
|
Ivana Varekova |
0b25c18 |
- (strstr(line, "with")) && (strstr(line, "fstype"))) {
|
|
Ivana Varekova |
0b25c18 |
-
|
|
Ivana Varekova |
0b25c18 |
- sscanf(strstr(line, "fstype") + 6, "%10s", type_name);
|
|
Ivana Varekova |
0b25c18 |
- if ((!strncmp(type_name, "nfs", 3)) && (strncmp(type_name, "nfsd", 4))) {
|
|
Ivana Varekova |
0b25c18 |
- nfs ++;
|
|
Ivana Varekova |
0b25c18 |
- }
|
|
Ivana Varekova |
0b25c18 |
+ (strstr(line, "with fstype nfs")) &&
|
|
Ivana Varekova |
0b25c18 |
+ !(strstr(line, "with fstype nfsd"))) {
|
|
Ivana Varekova |
0b25c18 |
+ nfs++;
|
|
Ivana Varekova |
0b25c18 |
}
|
|
Ivana Varekova |
0b25c18 |
}
|
|
Ivana Varekova |
0b25c18 |
|