Date: Sun, 21 Jul 2013 22:21:12 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r253535 - in projects/nfsv4.1-server/sys/fs: nfsclient nfsserver Message-ID: <201307212221.r6LMLCcO016650@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Sun Jul 21 22:21:12 2013 New Revision: 253535 URL: http://svnweb.freebsd.org/changeset/base/253535 Log: Fix the nfsv4.1 server kernel code so that it builds. Modified: projects/nfsv4.1-server/sys/fs/nfsclient/nfs_clstate.c projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdserv.c Modified: projects/nfsv4.1-server/sys/fs/nfsclient/nfs_clstate.c ============================================================================== --- projects/nfsv4.1-server/sys/fs/nfsclient/nfs_clstate.c Sun Jul 21 22:20:44 2013 (r253534) +++ projects/nfsv4.1-server/sys/fs/nfsclient/nfs_clstate.c Sun Jul 21 22:21:12 2013 (r253535) @@ -3548,7 +3548,7 @@ out: if (clp != NULL) { nfsv4_seqsess_cacherep(slotid, NFSMNT_MDSSESSION(clp->nfsc_nmp)->nfsess_cbslots, - rep); + NFSERR_OK, &rep); NFSUNLOCKCLSTATE(); } else { NFSUNLOCKCLSTATE(); Modified: projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdserv.c ============================================================================== --- projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdserv.c Sun Jul 21 22:20:44 2013 (r253534) +++ projects/nfsv4.1-server/sys/fs/nfsserver/nfs_nfsdserv.c Sun Jul 21 22:21:12 2013 (r253535) @@ -3697,7 +3697,7 @@ nfsrvd_exchangeid(struct nfsrv_descript strlen(nd->nd_cred->cr_prison->pr_hostuuid)); /* Major */ NFSM_BUILD(tl, uint32_t *, 3 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(NFSX_UNSIGNED); - NFSBCOPY(&time_uptime, tl++, NFSX_UNSIGNED); + *tl++ = time_uptime; /* Make scope a unique value. */ *tl = txdr_unsigned(1); (void)nfsm_strtom(nd, "freebsd.org", strlen("freebsd.org")); (void)nfsm_strtom(nd, version, strlen(version));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307212221.r6LMLCcO016650>