svn commit: r334250 - projects/pnfs-planb-server/sys/fs/nfsserver

[Rick Macklem]

Author: rmacklem
Date: Sat May 26 21:42:27 2018
New Revision: 334250
URL: https://svnweb.freebsd.org/changeset/base/334250

Log:
  This fix is already in head/current, but I wanted it here too, since it
  affects testing of the pNFS server when it reboots with Linux client mounts.

Modified:
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdserv.c

Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdserv.c	Sat May 26 21:36:28 2018	(r334249)
+++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdserv.c	Sat May 26 21:42:27 2018	(r334250)
@@ -4036,9 +4036,9 @@ nfsrvd_exchangeid(struct nfsrv_descript *nd, __unused 
 		txdr_hyper(owner_minor, tl);			/* Minor */
 		(void)nfsm_strtom(nd, nd->nd_cred->cr_prison->pr_hostuuid,
 		    strlen(nd->nd_cred->cr_prison->pr_hostuuid)); /* Major */
-		NFSM_BUILD(tl, uint32_t *, 3 * NFSX_UNSIGNED);
-		*tl++ = txdr_unsigned(NFSX_UNSIGNED);
-		*tl++ = time_uptime;		/* Make scope a unique value. */
+		(void)nfsm_strtom(nd, nd->nd_cred->cr_prison->pr_hostuuid,
+		    strlen(nd->nd_cred->cr_prison->pr_hostuuid)); /* Scope */
+		NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED);
 		*tl = txdr_unsigned(1);
 		(void)nfsm_strtom(nd, "freebsd.org", strlen("freebsd.org"));
 		(void)nfsm_strtom(nd, version, strlen(version));