svn commit: r317552 - projects/pnfs-planb-server/sys/fs/nfs

[Rick Macklem]

Author: rmacklem
Date: Fri Apr 28 13:13:23 2017
New Revision: 317552
URL: https://svnweb.freebsd.org/changeset/base/317552

Log:
  Add #if _KERNEL macros to nfsproto.h so it can be included easily in userland.
  This allows it to be included in nfsd.c.

Modified:
  projects/pnfs-planb-server/sys/fs/nfs/nfsproto.h

Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsproto.h
==============================================================================
--- projects/pnfs-planb-server/sys/fs/nfs/nfsproto.h	Fri Apr 28 12:12:24 2017	(r317551)
+++ projects/pnfs-planb-server/sys/fs/nfs/nfsproto.h	Fri Apr 28 13:13:23 2017	(r317552)
@@ -653,6 +653,7 @@
 #define	NFSFLAYUTIL_COMMIT_THRU_MDS	0x2
 #define	NFSFLAYUTIL_STRIPE_MASK		0xffffffc0
 
+#if defined(_KERNEL) || defined(KERNEL)
 /* Conversion macros */
 #define	vtonfsv2_mode(t,m) 						\
 		txdr_unsigned(((t) == VFIFO) ? MAKEIMODE(VCHR, (m)) : 	\
@@ -802,6 +803,7 @@ struct nfsv3_sattr {
 	u_int32_t sa_mtimetype;
 	nfstime3  sa_mtime;
 };
+#endif	/* _KERNEL */
 
 /*
  * The attribute bits used for V4.