From owner-svn-src-head@FreeBSD.ORG Wed May 4 13:30:39 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0742A1065673; Wed, 4 May 2011 13:30:39 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EABE68FC1B; Wed, 4 May 2011 13:30:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p44DUcVJ051604; Wed, 4 May 2011 13:30:38 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p44DUcwl051601; Wed, 4 May 2011 13:30:38 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201105041330.p44DUcwl051601@svn.freebsd.org> From: Rick Macklem Date: Wed, 4 May 2011 13:30:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221438 - in head/sys: fs/nfs nfs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2011 13:30:39 -0000 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 */