From owner-svn-src-projects@FreeBSD.ORG  Sun Jul 21 22:21:13 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 47C67F62;
 Sun, 21 Jul 2013 22:21:13 +0000 (UTC)
 (envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 3969978D;
 Sun, 21 Jul 2013 22:21:13 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6LMLDKU016652;
 Sun, 21 Jul 2013 22:21:13 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6LMLCcO016650;
 Sun, 21 Jul 2013 22:21:12 GMT
 (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201307212221.r6LMLCcO016650@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 21 Jul 2013 22:21:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r253535 - in projects/nfsv4.1-server/sys/fs: nfsclient
 nfsserver
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Jul 2013 22:21:13 -0000

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));