From owner-svn-src-projects@FreeBSD.ORG Thu Apr 26 14:51:13 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2EADA106566B; Thu, 26 Apr 2012 14:51:13 +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 0FF6C8FC17; Thu, 26 Apr 2012 14:51:13 +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 q3QEpCjl053946; Thu, 26 Apr 2012 14:51:12 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3QEpC5m053939; Thu, 26 Apr 2012 14:51:12 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201204261451.q3QEpC5m053939@svn.freebsd.org> From: Rick Macklem Date: Thu, 26 Apr 2012 14:51:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r234710 - in projects/nfsv4.1-client/sys/fs: nfs nfsclient X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Apr 2012 14:51:13 -0000 Author: rmacklem Date: Thu Apr 26 14:51:12 2012 New Revision: 234710 URL: http://svn.freebsd.org/changeset/base/234710 Log: Change the tag (which is useful for debugging when looking at packet traces) for the read from a DS to ReadDS, although it is otherwise the same as a read from an MDS. Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c projects/nfsv4.1-client/sys/fs/nfs/nfsport.h projects/nfsv4.1-client/sys/fs/nfs/nfsproto.h projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clcomsubs.c projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c Thu Apr 26 14:34:46 2012 (r234709) +++ projects/nfsv4.1-client/sys/fs/nfs/nfs_commonkrpc.c Thu Apr 26 14:51:12 2012 (r234710) @@ -887,6 +887,7 @@ printf("foreslots growing %d\n", retval) nd->nd_procnum != NFSPROC_DELEGRETURN && nd->nd_procnum != NFSPROC_SETATTR && nd->nd_procnum != NFSPROC_READ && + nd->nd_procnum != NFSPROC_READDS && nd->nd_procnum != NFSPROC_WRITE && nd->nd_procnum != NFSPROC_WRITEDS && nd->nd_procnum != NFSPROC_OPEN && Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c Thu Apr 26 14:34:46 2012 (r234709) +++ projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c Thu Apr 26 14:51:12 2012 (r234710) @@ -168,7 +168,7 @@ static struct nfsuserlruhead nfsuserlruh */ int nfs_bigreply[NFSV41_NPROCS] = { 0, 0, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; /* local functions */ static int nfsrv_skipace(struct nfsrv_descript *nd, int *acesizep); Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsport.h ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfsport.h Thu Apr 26 14:34:46 2012 (r234709) +++ projects/nfsv4.1-client/sys/fs/nfs/nfsport.h Thu Apr 26 14:51:12 2012 (r234710) @@ -348,11 +348,12 @@ #define NFSPROC_LAYOUTRETURN 49 #define NFSPROC_RECLAIMCOMPL 50 #define NFSPROC_WRITEDS 51 +#define NFSPROC_READDS 52 /* * Must be defined as one higher than the last NFSv4.1 Proc# above. */ -#define NFSV41_NPROCS 52 +#define NFSV41_NPROCS 53 #endif /* NFS_V3NPROCS */ Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsproto.h ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfs/nfsproto.h Thu Apr 26 14:34:46 2012 (r234709) +++ projects/nfsv4.1-client/sys/fs/nfs/nfsproto.h Thu Apr 26 14:51:12 2012 (r234710) @@ -315,11 +315,12 @@ #define NFSPROC_LAYOUTRETURN 49 #define NFSPROC_RECLAIMCOMPL 50 #define NFSPROC_WRITEDS 51 +#define NFSPROC_READDS 52 /* * Must be defined as one higher than the last NFSv4.1 Proc# above. */ -#define NFSV41_NPROCS 52 +#define NFSV41_NPROCS 53 #endif /* NFS_V3NPROCS */ Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clcomsubs.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clcomsubs.c Thu Apr 26 14:34:46 2012 (r234709) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clcomsubs.c Thu Apr 26 14:51:12 2012 (r234710) @@ -110,16 +110,16 @@ static struct { { NFSV4OP_LAYOUTRETURN, 1, "LayoutReturn", 12, }, { NFSV4OP_RECLAIMCOMPL, 1, "ReclaimComplete", 15, }, { NFSV4OP_WRITE, 1, "WriteDS", 7, }, + { NFSV4OP_READ, 1, "ReadDS", 6, }, }; - /* * NFS RPCS that have large request message size. */ static int nfs_bigrequest[NFSV41_NPROCS] = { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1 + 0, 0, 0, 0, 0, 0, 1, 0 }; /* Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Thu Apr 26 14:34:46 2012 (r234709) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Thu Apr 26 14:51:12 2012 (r234710) @@ -5499,7 +5499,7 @@ nfsrpc_readds(vnode_t vp, struct uio *ui struct nfssockreq *nrp; nd->nd_mrep = NULL; - nfscl_reqstart(nd, NFSPROC_READ, nmp, fhp->nfh_fh, fhp->nfh_len, + nfscl_reqstart(nd, NFSPROC_READDS, nmp, fhp->nfh_fh, fhp->nfh_len, NULL, &dsp->nfsclds_sess); nfsm_stateidtom(nd, stateidp, NFSSTATEID_PUTSEQIDZERO); NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED * 3);