svn commit: r358050 - projects/nfs-over-tls/sys/fs/nfs

[Rick Macklem]

Author: rmacklem
Date: Mon Feb 17 20:35:25 2020
New Revision: 358050
URL: https://svnweb.freebsd.org/changeset/base/358050

Log:
  Update nfsport.h. I haven't yet decided what to do about NFSVOPUNLOCK(),
  since the second argument was removed and that makes code merge very
  difficult.

Modified:
  projects/nfs-over-tls/sys/fs/nfs/nfsport.h

Modified: projects/nfs-over-tls/sys/fs/nfs/nfsport.h
==============================================================================
--- projects/nfs-over-tls/sys/fs/nfs/nfsport.h	Mon Feb 17 20:27:05 2020	(r358049)
+++ projects/nfs-over-tls/sys/fs/nfs/nfsport.h	Mon Feb 17 20:35:25 2020	(r358050)
@@ -53,6 +53,7 @@
 #include <sys/filedesc.h>
 #include <sys/jail.h>
 #include <sys/kernel.h>
+#include <sys/ktls.h>
 #include <sys/lockf.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
@@ -115,6 +116,10 @@
 #include <ufs/ufs/ufsmount.h>
 #include <vm/uma.h>
 #include <vm/vm.h>
+#include <vm/pmap.h>
+#include <vm/vm_page.h>
+#include <vm/vm_pageout.h>
+#include <vm/vm_param.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
 #include <nfs/nfssvc.h>
@@ -1057,6 +1062,7 @@ bool ncl_pager_setsize(struct vnode *vp, u_quad_t *nsi
 #define	NFSHASOPENMODE(n)	((n)->nm_state & NFSSTA_OPENMODE)
 #define	NFSHASONEOPENOWN(n)	(((n)->nm_flag & NFSMNT_ONEOPENOWN) != 0 &&	\
 				    (n)->nm_minorvers > 0)
+#define	NFSHASTLS(n)		(((n)->nm_newflag & NFSMNT_TLS) != 0)
 
 /*
  * Gets the stats field out of the mount structure.