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

[Rick Macklem]

Author: rmacklem
Date: Fri Apr 28 01:54:01 2017
New Revision: 317540
URL: https://svnweb.freebsd.org/changeset/base/317540

Log:
  Fix up the build.

Modified:
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdkrpc.c
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c

Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdkrpc.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdkrpc.c	Fri Apr 28 01:36:43 2017	(r317539)
+++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdkrpc.c	Fri Apr 28 01:54:01 2017	(r317540)
@@ -103,6 +103,7 @@ static int nfs_proc(struct nfsrv_descrip
 extern u_long sb_max_adj;
 extern int newnfs_numnfsd;
 extern struct proc *nfsd_master_proc;
+extern time_t nfsdev_time;
 
 /*
  * NFS server system calls
@@ -493,6 +494,7 @@ nfsrvd_nfsd(struct thread *td, struct nf
 	 */
 	NFSD_LOCK();
 	if (newnfs_numnfsd == 0) {
+		nfsdev_time = time_second;
 		p = td->td_proc;
 		PROC_LOCK(p);
 		p->p_flag2 |= P2_AST_SU;

Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c	Fri Apr 28 01:36:43 2017	(r317539)
+++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdport.c	Fri Apr 28 01:54:01 2017	(r317540)
@@ -1766,7 +1766,6 @@ nfsrvd_readdir(struct nfsrv_descript *nd
 	fullsiz = siz;
 	if (nd->nd_flag & ND_NFSV3) {
 		nd->nd_repstat = getret = nfsvno_getattr(vp, &at, nd, p, 1);
-		    p, 1);
 #if 0
 		/*
 		 * va_filerev is not sufficient as a cookie verifier,

Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c	Fri Apr 28 01:36:43 2017	(r317539)
+++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdstate.c	Fri Apr 28 01:54:01 2017	(r317540)
@@ -35,6 +35,8 @@ struct nfsrv_stablefirst nfsrv_stablefir
 int nfsrv_issuedelegs = 0;
 int nfsrv_dolocallocks = 0;
 struct nfsv4lock nfsv4rootfs_lock;
+struct nfsdevicehead nfsrv_devidhead;
+time_t nfsdev_time = 0;
 
 extern int newnfs_numnfsd;
 extern struct nfsstatsv1 nfsstatsv1;