From owner-svn-src-projects@FreeBSD.ORG Sat Dec 31 00:51:16 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADD6F106566B; Sat, 31 Dec 2011 00:51:16 +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 823BD8FC12; Sat, 31 Dec 2011 00:51:16 +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 pBV0pGpe038936; Sat, 31 Dec 2011 00:51:16 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBV0pGtp038934; Sat, 31 Dec 2011 00:51:16 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201112310051.pBV0pGtp038934@svn.freebsd.org> From: Rick Macklem Date: Sat, 31 Dec 2011 00:51:16 +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: r229055 - projects/nfsv4.1-client/sys/fs/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: Sat, 31 Dec 2011 00:51:16 -0000 Author: rmacklem Date: Sat Dec 31 00:51:16 2011 New Revision: 229055 URL: http://svn.freebsd.org/changeset/base/229055 Log: Modify the nfsrpc_exchangeid() and nfsrpc_createsession() functions to use the new session structure. Later these functions will get extra arguments that will allow them to use a session structure other than the default one in the nfsclclient structure. Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Sat Dec 31 00:47:54 2011 (r229054) +++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c Sat Dec 31 00:51:16 2011 (r229055) @@ -4295,7 +4295,7 @@ printf("exch err=%d reps=%d\n",error,nd- NFSM_DISSECT(tl, u_int32_t *, 4 * NFSX_UNSIGNED); clp->nfsc_clientid.lval[0] = *tl++; clp->nfsc_clientid.lval[1] = *tl++; - nmp->nm_sequenceid = fxdr_unsigned(uint32_t, *tl++); + clp->nfsc_sequenceid = fxdr_unsigned(uint32_t, *tl++); v41flags = fxdr_unsigned(uint32_t, *tl); printf("v41fl=0x%x\n", v41flags); } @@ -4321,8 +4321,8 @@ nfsrpc_createsession(struct nfsmount *nm NFSM_BUILD(tl, uint32_t *, 4 * NFSX_UNSIGNED); *tl++ = clp->nfsc_clientid.lval[0]; *tl++ = clp->nfsc_clientid.lval[1]; - *tl++ = txdr_unsigned(nmp->nm_sequenceid); -printf("nmpseq0=0x%x\n",nmp->nm_sequenceid); + *tl++ = txdr_unsigned(clp->nfsc_sequenceid); +printf("clseq0=0x%x\n",clp->nfsc_sequenceid); if (nfscl_enablecallb != 0 && nfs_numnfscbd > 0) *tl = txdr_unsigned(NFSV4CRSESS_PERSIST | NFSV4CRSESS_CONNBACKCHAN); @@ -4370,8 +4370,8 @@ printf("nmpseq0=0x%x\n",nmp->nm_sequence 2 * NFSX_UNSIGNED); bcopy(tl, clp->nfsc_sessionid, NFSX_V4SESSIONID); tl += NFSX_V4SESSIONID / NFSX_UNSIGNED; - nmp->nm_sequenceid = fxdr_unsigned(uint32_t, *tl++); -printf("nmseq=0x%x\n",nmp->nm_sequenceid); + clp->nfsc_sequenceid = fxdr_unsigned(uint32_t, *tl++); +printf("clseq=0x%x\n",clp->nfsc_sequenceid); printf("crfl=0x%x\n",fxdr_unsigned(uint32_t, *tl)); /* Don't care about replied flags for now. */ @@ -4379,8 +4379,8 @@ printf("crfl=0x%x\n",fxdr_unsigned(uint3 NFSM_DISSECT(tl, uint32_t *, 7 * NFSX_UNSIGNED); printf("cr %d %d %d %d %d\n",fxdr_unsigned(uint32_t, *tl),fxdr_unsigned(uint32_t, *(tl+1)),fxdr_unsigned(uint32_t, *(tl+2)),fxdr_unsigned(uint32_t, *(tl+3)),fxdr_unsigned(uint32_t, *(tl+4))); tl += 5; /* Skip the other counts. */ - nmp->nm_foreslots = fxdr_unsigned(uint16_t, *tl++); -printf("fore slots=%d\n", nmp->nm_foreslots); + clp->nfsc_foreslots = fxdr_unsigned(uint16_t, *tl++); +printf("fore slots=%d\n", clp->nfsc_foreslots); irdcnt = fxdr_unsigned(int, *tl); if (irdcnt > 0) { printf("got an ird cnt=%d\n",irdcnt);