svn commit: r332804 - in projects/pnfs-planb-server/sys/fs: nfs nfsserver

[Rick Macklem]

Author: rmacklem
Date: Fri Apr 20 01:25:48 2018
New Revision: 332804
URL: https://svnweb.freebsd.org/changeset/base/332804

Log:
  Update two more kernel files for mirrored DS recovery.

Modified:
  projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c
  projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdsubs.c

Modified: projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c	Fri Apr 20 00:59:53 2018	(r332803)
+++ projects/pnfs-planb-server/sys/fs/nfs/nfs_commonport.c	Fri Apr 20 01:25:48 2018	(r332804)
@@ -76,6 +76,7 @@ struct mtx nfsrv_dwrpclock_mtx;
 struct mtx nfsrv_dsrpclock_mtx;
 struct mtx nfsrv_darpclock_mtx;
 struct nfsdevicehead nfsrv_devidhead;
+volatile int nfsrv_devidcnt = 0;
 void (*nfsd_call_servertimer)(void) = NULL;
 void (*ncl_call_invalcaches)(struct vnode *) = NULL;
 

Modified: projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdsubs.c
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdsubs.c	Fri Apr 20 00:59:53 2018	(r332803)
+++ projects/pnfs-planb-server/sys/fs/nfsserver/nfs_nfsdsubs.c	Fri Apr 20 01:25:48 2018	(r332804)
@@ -59,6 +59,8 @@ extern uid_t nfsrv_defaultuid;
 extern gid_t nfsrv_defaultgid;
 
 char nfs_v2pubfh[NFSX_V2FH];
+struct nfsdontlisthead nfsrv_dontlisthead;
+struct nfslayouthead nfsrv_recalllisthead;
 static nfstype newnfsv2_type[9] = { NFNON, NFREG, NFDIR, NFBLK, NFCHR, NFLNK,
     NFNON, NFCHR, NFNON };
 extern nfstype nfsv34_type[9];
@@ -2068,6 +2070,8 @@ nfsd_init(void)
 		mtx_init(&nfslayouthash[i].mtx, "nfslm", NULL, MTX_DEF);
 		LIST_INIT(&nfslayouthash[i].list);
 	}
+	LIST_INIT(&nfsrv_dontlisthead);
+	LIST_INIT(&nfsrv_recalllisthead);
 
 	/* and the v2 pubfh should be all zeros */
 	NFSBZERO(nfs_v2pubfh, NFSX_V2FH);