Date: Wed, 4 May 2011 13:30:38 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r221438 - in head/sys: fs/nfs nfs Message-ID: <201105041330.p44DUcwl051601@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105041330.p44DUcwl051601>