More idempotency....... this is fun :-)

23 files changed, 134 insertions, 23 deletions

diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 999df08..acabf8f 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.2 1994/08/02 07:52:04 davidg Exp $
+ * $Id: nfs.h,v 1.3 1994/08/04 06:03:46 davidg Exp $
  */
 
+#ifndef _NFS_NFS_H_
+#define _NFS_NFS_H_
+
 /*
  * Tunable constants for nfs
  */
@@ -300,3 +303,5 @@ struct nfsd {
 #define	NFSD_NEEDAUTH	0x08
 #define	NFSD_AUTHFAIL	0x10
 #endif	/* KERNEL */
+
+#endif
diff --git a/sys/nfs/nfs_common.h b/sys/nfs/nfs_common.h
index 4a849db..603f362 100644
--- a/sys/nfs/nfs_common.h
+++ b/sys/nfs/nfs_common.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
- * $Id$
+ * $Id: nfsm_subs.h,v 1.2 1994/08/02 07:52:20 davidg Exp $
  */
 
+#ifndef _NFS_NFSM_SUBS_H_
+#define _NFS_NFSM_SUBS_H_
+
 /*
  * These macros do strange and peculiar things to mbuf chains for
  * the assistance of the nfs code. To attempt to use them for any
@@ -268,3 +271,4 @@ extern struct mbuf *nfsm_reqh();
 		txdr_hyper(&vap->va_filerev, &fp->fa_nqfilerev); \
 	}
 
+#endif
diff --git a/sys/nfs/nfsdiskless.h b/sys/nfs/nfsdiskless.h
index a546fc3..5df85e0 100644
--- a/sys/nfs/nfsdiskless.h
+++ b/sys/nfs/nfsdiskless.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsdiskless.h,v 1.2 1994/08/02 07:52:19 davidg Exp $
+ * $Id: nfsdiskless.h,v 1.3 1994/08/05 09:28:49 davidg Exp $
  */
 
+#ifndef _NFS_NFSDISKLESS_H_
+#define _NFS_NFSDISKLESS_H_
+
 /*
  * Structure that must be initialized for a diskless nfs client.
  * This structure is used by nfs_mountroot() to set up the root and swap
@@ -65,3 +68,5 @@ struct nfs_diskless {
 	long		root_time;		/* Timestamp of root fs */
 	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
 };
+
+#endif
diff --git a/sys/nfs/nfsm_subs.h b/sys/nfs/nfsm_subs.h
index 4a849db..603f362 100644
--- a/sys/nfs/nfsm_subs.h
+++ b/sys/nfs/nfsm_subs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
- * $Id$
+ * $Id: nfsm_subs.h,v 1.2 1994/08/02 07:52:20 davidg Exp $
  */
 
+#ifndef _NFS_NFSM_SUBS_H_
+#define _NFS_NFSM_SUBS_H_
+
 /*
  * These macros do strange and peculiar things to mbuf chains for
  * the assistance of the nfs code. To attempt to use them for any
@@ -268,3 +271,4 @@ extern struct mbuf *nfsm_reqh();
 		txdr_hyper(&vap->va_filerev, &fp->fa_nqfilerev); \
 	}
 
+#endif
diff --git a/sys/nfs/nfsmount.h b/sys/nfs/nfsmount.h
index 5cb1cc2..78ba00b 100644
--- a/sys/nfs/nfsmount.h
+++ b/sys/nfs/nfsmount.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: nfsmount.h,v 1.2 1994/08/02 07:52:21 davidg Exp $
  */
 
+#ifndef _NFS_NFSMOUNT_H_
+#define _NFS_NFSMOUNT_H_
+
 /*
  * Mount structure.
  * One allocated on every NFS mount.
@@ -126,3 +129,5 @@ int	nfs_vptofh __P((
 		struct vnode *vp,
 		struct fid *fhp));
 int	nfs_init __P(());
+
+#endif
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index ab88873..0eb12b3 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.3 1994/08/08 17:30:55 davidg Exp $
+ * $Id: nfsnode.h,v 1.4 1994/08/09 15:10:14 davidg Exp $
  */
 
+#ifndef _NFS_NFSNODE_H_
+#define _NFS_NFSNODE_H_
+
 /*
  * Silly rename structure that hangs off the nfsnode until the name
  * can be removed by nfs_inactive()
@@ -165,3 +168,5 @@ int	nfs_truncate __P((struct vop_truncate_args *));
 int	nfs_update __P((struct vop_update_args *));
 int	nfs_bwrite __P((struct vop_bwrite_args *));
 #endif /* KERNEL */
+
+#endif
diff --git a/sys/nfs/nfsrtt.h b/sys/nfs/nfsrtt.h
index f0be0e0..4463f62 100644
--- a/sys/nfs/nfsrtt.h
+++ b/sys/nfs/nfsrtt.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrtt.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: nfsrtt.h,v 1.2 1994/08/02 07:52:24 davidg Exp $
  */
 
+#ifndef _NFS_NFSRTT_H_
+#define _NFS_NFSRTT_H_
+
 /*
  * Definitions for performance monitor.
  * The client and server logging are turned on by setting the global
@@ -95,3 +98,5 @@ struct nfsdrt {
 		struct timeval tstamp;	/* Timestamp of log entry */
 	} drt[NFSRTTLOGSIZ];
 };
+
+#endif
diff --git a/sys/nfs/nfsrvcache.h b/sys/nfs/nfsrvcache.h
index 8fa2246..00eac6a 100644
--- a/sys/nfs/nfsrvcache.h
+++ b/sys/nfs/nfsrvcache.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: nfsrvcache.h,v 1.2 1994/08/02 07:52:25 davidg Exp $
  */
 
+#ifndef _NFS_NFSRVCACHE_H_
+#define _NFS_NFSRVCACHE_H_
+
 /*
  * Definitions for the server recent request cache
  */
@@ -83,3 +86,5 @@ struct nfsrvcache {
 #define	RC_NQNFS	0x10
 #define	RC_INETADDR	0x20
 #define	RC_NAM		0x40
+
+#endif
diff --git a/sys/nfs/nfsv2.h b/sys/nfs/nfsv2.h
index fb557c8..62ba338 100644
--- a/sys/nfs/nfsv2.h
+++ b/sys/nfs/nfsv2.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsv2.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsv2.h,v 1.2 1994/08/02 07:52:26 davidg Exp $
+ * $Id: nfsv2.h,v 1.3 1994/08/18 22:35:37 wollman Exp $
  */
 
+#ifndef _NFS_NFSV2_H_
+#define _NFS_NFSV2_H_
+
 /*
  * nfs definitions as per the version 2 specs
  */
@@ -258,3 +261,5 @@ struct nfsv2_statfs {
 	u_long	sf_files;	/* Nqnfs only */
 	u_long	sf_ffree;	/* ditto      */
 };
+
+#endif
diff --git a/sys/nfs/nqnfs.h b/sys/nfs/nqnfs.h
index 94193d0..2189109 100644
--- a/sys/nfs/nqnfs.h
+++ b/sys/nfs/nqnfs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nqnfs.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: nqnfs.h,v 1.2 1994/08/02 07:52:28 davidg Exp $
  */
 
+#ifndef _NFS_NQNFS_H_
+#define _NFS_NQNFS_H_
+
 /*
  * Definitions for NQNFS (Not Quite NFS) cache consistency protocol.
  */
@@ -197,3 +200,5 @@ extern u_long nqfheadhash;
 #define	NQNFS_EXPIRED	500
 #define	NQNFS_TRYLATER	501
 #define NQNFS_AUTHERR	502
+
+#endif
diff --git a/sys/nfs/rpcv2.h b/sys/nfs/rpcv2.h
index 67a1f69..2360cdc 100644
--- a/sys/nfs/rpcv2.h
+++ b/sys/nfs/rpcv2.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)rpcv2.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: rpcv2.h,v 1.2 1994/08/02 07:52:29 davidg Exp $
  */
 
+#ifndef _NFS_RPCV2_H_
+#define _NFS_RPCV2_H_
+
 /*
  * Definitions for Sun RPC Version 2, from
  * "RPC: Remote Procedure Call Protocol Specification" RFC1057
@@ -87,3 +90,5 @@
 #define	RPCMNT_NAMELEN	255
 #define	RPCMNT_PATHLEN	1024
 #define	RPCPROG_NFS	100003
+
+#endif
diff --git a/sys/nfs/xdr_subs.h b/sys/nfs/xdr_subs.h
index 98a1c01..b081b11 100644
--- a/sys/nfs/xdr_subs.h
+++ b/sys/nfs/xdr_subs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)xdr_subs.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: xdr_subs.h,v 1.2 1994/08/02 07:52:30 davidg Exp $
  */
 
+#ifndef _NFS_XDR_SUBS_H_
+#define _NFS_XDR_SUBS_H_
+
 /*
  * Macros used for conversion to/from xdr representation by nfs...
  * These use the MACHINE DEPENDENT routines ntohl, htonl
@@ -77,3 +80,5 @@
 	((long *)(t))[0] = htonl(((long *)(f))[_QUAD_HIGHWORD]); \
 	((long *)(t))[1] = htonl(((long *)(f))[_QUAD_LOWWORD]); \
 }
+
+#endif
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 999df08..acabf8f 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.2 1994/08/02 07:52:04 davidg Exp $
+ * $Id: nfs.h,v 1.3 1994/08/04 06:03:46 davidg Exp $
  */
 
+#ifndef _NFS_NFS_H_
+#define _NFS_NFS_H_
+
 /*
  * Tunable constants for nfs
  */
@@ -300,3 +303,5 @@ struct nfsd {
 #define	NFSD_NEEDAUTH	0x08
 #define	NFSD_AUTHFAIL	0x10
 #endif	/* KERNEL */
+
+#endif
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 999df08..acabf8f 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.2 1994/08/02 07:52:04 davidg Exp $
+ * $Id: nfs.h,v 1.3 1994/08/04 06:03:46 davidg Exp $
  */
 
+#ifndef _NFS_NFS_H_
+#define _NFS_NFS_H_
+
 /*
  * Tunable constants for nfs
  */
@@ -300,3 +303,5 @@ struct nfsd {
 #define	NFSD_NEEDAUTH	0x08
 #define	NFSD_AUTHFAIL	0x10
 #endif	/* KERNEL */
+
+#endif
diff --git a/sys/nfsclient/nfsdiskless.h b/sys/nfsclient/nfsdiskless.h
index a546fc3..5df85e0 100644
--- a/sys/nfsclient/nfsdiskless.h
+++ b/sys/nfsclient/nfsdiskless.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsdiskless.h	8.1 (Berkeley) 6/10/93
- * $Id: nfsdiskless.h,v 1.2 1994/08/02 07:52:19 davidg Exp $
+ * $Id: nfsdiskless.h,v 1.3 1994/08/05 09:28:49 davidg Exp $
  */
 
+#ifndef _NFS_NFSDISKLESS_H_
+#define _NFS_NFSDISKLESS_H_
+
 /*
  * Structure that must be initialized for a diskless nfs client.
  * This structure is used by nfs_mountroot() to set up the root and swap
@@ -65,3 +68,5 @@ struct nfs_diskless {
 	long		root_time;		/* Timestamp of root fs */
 	char		my_hostnam[MAXHOSTNAMELEN]; /* Client host name */
 };
+
+#endif
diff --git a/sys/nfsclient/nfsm_subs.h b/sys/nfsclient/nfsm_subs.h
index 4a849db..603f362 100644
--- a/sys/nfsclient/nfsm_subs.h
+++ b/sys/nfsclient/nfsm_subs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
- * $Id$
+ * $Id: nfsm_subs.h,v 1.2 1994/08/02 07:52:20 davidg Exp $
  */
 
+#ifndef _NFS_NFSM_SUBS_H_
+#define _NFS_NFSM_SUBS_H_
+
 /*
  * These macros do strange and peculiar things to mbuf chains for
  * the assistance of the nfs code. To attempt to use them for any
@@ -268,3 +271,4 @@ extern struct mbuf *nfsm_reqh();
 		txdr_hyper(&vap->va_filerev, &fp->fa_nqfilerev); \
 	}
 
+#endif
diff --git a/sys/nfsclient/nfsmount.h b/sys/nfsclient/nfsmount.h
index 5cb1cc2..78ba00b 100644
--- a/sys/nfsclient/nfsmount.h
+++ b/sys/nfsclient/nfsmount.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsmount.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: nfsmount.h,v 1.2 1994/08/02 07:52:21 davidg Exp $
  */
 
+#ifndef _NFS_NFSMOUNT_H_
+#define _NFS_NFSMOUNT_H_
+
 /*
  * Mount structure.
  * One allocated on every NFS mount.
@@ -126,3 +129,5 @@ int	nfs_vptofh __P((
 		struct vnode *vp,
 		struct fid *fhp));
 int	nfs_init __P(());
+
+#endif
diff --git a/sys/nfsclient/nfsnode.h b/sys/nfsclient/nfsnode.h
index ab88873..0eb12b3 100644
--- a/sys/nfsclient/nfsnode.h
+++ b/sys/nfsclient/nfsnode.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsnode.h	8.4 (Berkeley) 2/13/94
- * $Id: nfsnode.h,v 1.3 1994/08/08 17:30:55 davidg Exp $
+ * $Id: nfsnode.h,v 1.4 1994/08/09 15:10:14 davidg Exp $
  */
 
+#ifndef _NFS_NFSNODE_H_
+#define _NFS_NFSNODE_H_
+
 /*
  * Silly rename structure that hangs off the nfsnode until the name
  * can be removed by nfs_inactive()
@@ -165,3 +168,5 @@ int	nfs_truncate __P((struct vop_truncate_args *));
 int	nfs_update __P((struct vop_update_args *));
 int	nfs_bwrite __P((struct vop_bwrite_args *));
 #endif /* KERNEL */
+
+#endif
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 999df08..acabf8f 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.2 1994/08/02 07:52:04 davidg Exp $
+ * $Id: nfs.h,v 1.3 1994/08/04 06:03:46 davidg Exp $
  */
 
+#ifndef _NFS_NFS_H_
+#define _NFS_NFS_H_
+
 /*
  * Tunable constants for nfs
  */
@@ -300,3 +303,5 @@ struct nfsd {
 #define	NFSD_NEEDAUTH	0x08
 #define	NFSD_AUTHFAIL	0x10
 #endif	/* KERNEL */
+
+#endif
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 999df08..acabf8f 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.2 1994/08/02 07:52:04 davidg Exp $
+ * $Id: nfs.h,v 1.3 1994/08/04 06:03:46 davidg Exp $
  */
 
+#ifndef _NFS_NFS_H_
+#define _NFS_NFS_H_
+
 /*
  * Tunable constants for nfs
  */
@@ -300,3 +303,5 @@ struct nfsd {
 #define	NFSD_NEEDAUTH	0x08
 #define	NFSD_AUTHFAIL	0x10
 #endif	/* KERNEL */
+
+#endif
diff --git a/sys/nfsserver/nfsm_subs.h b/sys/nfsserver/nfsm_subs.h
index 4a849db..603f362 100644
--- a/sys/nfsserver/nfsm_subs.h
+++ b/sys/nfsserver/nfsm_subs.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsm_subs.h	8.1 (Berkeley) 6/16/93
- * $Id$
+ * $Id: nfsm_subs.h,v 1.2 1994/08/02 07:52:20 davidg Exp $
  */
 
+#ifndef _NFS_NFSM_SUBS_H_
+#define _NFS_NFSM_SUBS_H_
+
 /*
  * These macros do strange and peculiar things to mbuf chains for
  * the assistance of the nfs code. To attempt to use them for any
@@ -268,3 +271,4 @@ extern struct mbuf *nfsm_reqh();
 		txdr_hyper(&vap->va_filerev, &fp->fa_nqfilerev); \
 	}
 
+#endif
diff --git a/sys/nfsserver/nfsrvcache.h b/sys/nfsserver/nfsrvcache.h
index 8fa2246..00eac6a 100644
--- a/sys/nfsserver/nfsrvcache.h
+++ b/sys/nfsserver/nfsrvcache.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfsrvcache.h	8.1 (Berkeley) 6/10/93
- * $Id$
+ * $Id: nfsrvcache.h,v 1.2 1994/08/02 07:52:25 davidg Exp $
  */
 
+#ifndef _NFS_NFSRVCACHE_H_
+#define _NFS_NFSRVCACHE_H_
+
 /*
  * Definitions for the server recent request cache
  */
@@ -83,3 +86,5 @@ struct nfsrvcache {
 #define	RC_NQNFS	0x10
 #define	RC_INETADDR	0x20
 #define	RC_NAM		0x40
+
+#endif
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 999df08..acabf8f 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,9 +34,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs.h	8.1 (Berkeley) 6/10/93
- * $Id: nfs.h,v 1.2 1994/08/02 07:52:04 davidg Exp $
+ * $Id: nfs.h,v 1.3 1994/08/04 06:03:46 davidg Exp $
  */
 
+#ifndef _NFS_NFS_H_
+#define _NFS_NFS_H_
+
 /*
  * Tunable constants for nfs
  */
@@ -300,3 +303,5 @@ struct nfsd {
 #define	NFSD_NEEDAUTH	0x08
 #define	NFSD_AUTHFAIL	0x10
 #endif	/* KERNEL */
+
+#endif