svn commit: r221438 - in head/sys: fs/nfs nfs
Rick Macklem
rmacklem at FreeBSD.org
Wed May 4 13:30:39 UTC 2011
Author: rmacklem
Date: Wed May 4 13:30:38 2011
New Revision: 221438
URL: http://svn.freebsd.org/changeset/base/221438
Log:
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).
Modified:
head/sys/fs/nfs/nfs_commonport.c
head/sys/nfs/nfssvc.h
Modified: head/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonport.c Wed May 4 13:28:53 2011 (r221437)
+++ head/sys/fs/nfs/nfs_commonport.c Wed May 4 13:30:38 2011 (r221438)
@@ -404,8 +404,6 @@ nfssvc_call(struct thread *p, struct nfs
} 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;
Modified: head/sys/nfs/nfssvc.h
==============================================================================
--- head/sys/nfs/nfssvc.h Wed May 4 13:28:53 2011 (r221437)
+++ head/sys/nfs/nfssvc.h Wed May 4 13:30:38 2011 (r221438)
@@ -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 */
More information about the svn-src-head
mailing list