summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2011-05-04 13:30:38 +0000
committerrmacklem <rmacklem@FreeBSD.org>2011-05-04 13:30:38 +0000
commitc281a5b19811e96480cb7faf970ddd258f751ce9 (patch)
tree21d890a341b09b8cce60c71e9a71a97b6eea196f
parentb0a86c9f257a1311ae8daa811c6c3b6e199f05e5 (diff)
downloadFreeBSD-src-c281a5b19811e96480cb7faf970ddd258f751ce9.zip
FreeBSD-src-c281a5b19811e96480cb7faf970ddd258f751ce9.tar.gz
Revert r221306, since NFSSVC_ZEROSTATS zero'd both client and
server stats, when separate modifiers for NFSSVC_GETSTATS for each of client and server stats is what it required by nfsstat(1).
-rw-r--r--sys/fs/nfs/nfs_commonport.c2
-rw-r--r--sys/nfs/nfssvc.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/sys/fs/nfs/nfs_commonport.c b/sys/fs/nfs/nfs_commonport.c
index d9780e4..2073d26 100644
--- a/sys/fs/nfs/nfs_commonport.c
+++ b/sys/fs/nfs/nfs_commonport.c
@@ -404,8 +404,6 @@ nfssvc_call(struct thread *p, struct nfssvc_args *uap, struct ucred *cred)
} else if (uap->flag & NFSSVC_GETSTATS) {
error = copyout(&newnfsstats,
CAST_USER_ADDR_T(uap->argp), sizeof (newnfsstats));
- if ((uap->flag & NFSSVC_ZEROSTATS) != 0 && error == 0)
- bzero(&newnfsstats, sizeof(newnfsstats));
return (error);
} else if (uap->flag & NFSSVC_NFSUSERDPORT) {
u_short sockport;
diff --git a/sys/nfs/nfssvc.h b/sys/nfs/nfssvc.h
index e226e2b..d756dbf 100644
--- a/sys/nfs/nfssvc.h
+++ b/sys/nfs/nfssvc.h
@@ -64,6 +64,5 @@
#define NFSSVC_CBADDSOCK 0x00200000
#define NFSSVC_GETSTATS 0x00400000
#define NFSSVC_BACKUPSTABLE 0x00800000
-#define NFSSVC_ZEROSTATS 0x01000000 /* modifier for GETSTATS */
#endif /* _NFS_NFSSVC_H */
OpenPOWER on IntegriCloud