nfs-utils: "nfsstat -m" should report nfsv4 mounts too.

nfsstat -m lists all current nfs mounts, with the mount options. It does this by reading /proc/mounts and looking for mounts of type "nfs".
It really should check for "nfs4" as well. For simplicity, just check the first 3 characters of the type.

Signed-off-by NeilBrown <[email protected]>

utils/nfsstat/nfsstat.c +0 -0

index aa6c961..488c845 100644

That will, of course, report the "nfsd" mount as well, which we don't want. So let's try again.

NeilBrown

utils/nfsstat/nfsstat.c +0 -0

index aa6c961..d2cca8d 100644

Quoted 11 lines · Neil Brown

That will, of course, report the "nfsd" mount as well, which we don't want. So let's try again.

NeilBrown

utils/nfsstat/nfsstat.c +0 -0

index aa6c961..d2cca8d 100644

utils/nfsstat/nfsstat.c mounts(const char *name) · line 721

Quoted 7 lines

utils/nfsstat/nfsstat.c +1 -1

@@ -716,7 +716,7 @@ mounts(const char *name)
 		if (!(type = strtok(NULL, " \t")))
 			continue;
 
-		if (strcmp(type, "nfs")) {
+		if (strcmp(type, "nfs") && strcmp(type,"nfs4")) {
 		    continue;
 		}

Don't you want an OR?

Thanks for reviewing the patch (always appreciated), but no - I don't want OR.
What I really want is to eradicate all usages of
if (strcmp(X,Y))
in the world and make them
if (strcmp(X,Y) != 0)

Then it is clearer that it is a "!=" test.
In this case, the condition as I had it means"

If type is not nfs and type is not nfs4
(then continue)
which is what I want.

Your version says:
If type is not nfs or type is not nfs4

and that will always be true.

+ if (strcmp(type, "nfs") != 0 && strcmp(type, "nfs4") !
= 0)) {

NeilBrown