From 3301cc3c0a662e87eaedb3f0c0733638cd9b4188 Mon Sep 17 00:00:00 2001
From: Paul Richards <paul@FreeBSD.org>
Date: Sun, 21 Aug 1994 07:19:45 +0000
Subject: [PATCH] Made idempotent Reviewed by: Submitted by:

---
 sys/gnu/ext2fs/ext2_mount.h    | 7 +++++--
 sys/gnu/ext2fs/inode.h         | 7 ++++++-
 sys/gnu/fs/ext2fs/ext2_mount.h | 7 +++++--
 sys/gnu/fs/ext2fs/inode.h      | 7 ++++++-
 sys/ufs/lfs/lfs.h              | 7 ++++++-
 sys/ufs/lfs/lfs_extern.h       | 7 ++++++-
 sys/ufs/mfs/mfs_extern.h       | 7 ++++++-
 sys/ufs/mfs/mfsiom.h           | 7 ++++++-
 sys/ufs/mfs/mfsnode.h          | 7 ++++++-
 sys/ufs/ufs/dinode.h           | 7 ++++++-
 sys/ufs/ufs/dir.h              | 6 +++---
 sys/ufs/ufs/inode.h            | 7 ++++++-
 sys/ufs/ufs/quota.h            | 6 +++---
 sys/ufs/ufs/ufs_extern.h       | 7 ++++++-
 sys/ufs/ufs/ufsmount.h         | 7 +++++--
 sys/vm/vm_extern.h             | 7 ++++++-
 sys/vm/vm_pageout.h            | 7 ++++++-
 17 files changed, 93 insertions(+), 24 deletions(-)

diff --git a/sys/gnu/ext2fs/ext2_mount.h b/sys/gnu/ext2fs/ext2_mount.h
index 084abeb795d2..02fdff2eb3fa 100644
--- a/sys/gnu/ext2fs/ext2_mount.h
+++ b/sys/gnu/ext2fs/ext2_mount.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
- * $Id$
+ * $Id: ufsmount.h,v 1.2 1994/08/02 07:55:04 davidg Exp $
  */
 
+#ifndef _UFS_UFS_UFSMOUNT_H_
+#define _UFS_UFS_UFSMOUNT_H_
+
 struct buf;
 struct inode;
 struct nameidata;
@@ -81,4 +84,4 @@ struct ufsmount {
 #define	is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
 #define MNINDIR(ump)	((ump)->um_nindir)
 
-
+#endif
diff --git a/sys/gnu/ext2fs/inode.h b/sys/gnu/ext2fs/inode.h
index e37944321b47..cda8fb44b862 100644
--- a/sys/gnu/ext2fs/inode.h
+++ b/sys/gnu/ext2fs/inode.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $Id: inode.h,v 1.2 1994/08/02 07:54:49 davidg Exp $
  */
 
+#ifndef _UFS_UFS_INODE_H_
+#define _UFS_UFS_INODE_H_
+
 #include <ufs/ufs/dinode.h>
 
 /*
@@ -160,4 +163,6 @@ struct ufid {
 	ino_t	ufid_ino;	/* File number (ino). */
 	long	ufid_gen;	/* Generation number. */
 };
+
+#endif
 #endif /* KERNEL */
diff --git a/sys/gnu/fs/ext2fs/ext2_mount.h b/sys/gnu/fs/ext2fs/ext2_mount.h
index 084abeb795d2..02fdff2eb3fa 100644
--- a/sys/gnu/fs/ext2fs/ext2_mount.h
+++ b/sys/gnu/fs/ext2fs/ext2_mount.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
- * $Id$
+ * $Id: ufsmount.h,v 1.2 1994/08/02 07:55:04 davidg Exp $
  */
 
+#ifndef _UFS_UFS_UFSMOUNT_H_
+#define _UFS_UFS_UFSMOUNT_H_
+
 struct buf;
 struct inode;
 struct nameidata;
@@ -81,4 +84,4 @@ struct ufsmount {
 #define	is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
 #define MNINDIR(ump)	((ump)->um_nindir)
 
-
+#endif
diff --git a/sys/gnu/fs/ext2fs/inode.h b/sys/gnu/fs/ext2fs/inode.h
index e37944321b47..cda8fb44b862 100644
--- a/sys/gnu/fs/ext2fs/inode.h
+++ b/sys/gnu/fs/ext2fs/inode.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $Id: inode.h,v 1.2 1994/08/02 07:54:49 davidg Exp $
  */
 
+#ifndef _UFS_UFS_INODE_H_
+#define _UFS_UFS_INODE_H_
+
 #include <ufs/ufs/dinode.h>
 
 /*
@@ -160,4 +163,6 @@ struct ufid {
 	ino_t	ufid_ino;	/* File number (ino). */
 	long	ufid_gen;	/* Generation number. */
 };
+
+#endif
 #endif /* KERNEL */
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index 123858353eac..3f5aa07261da 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs.h	8.3 (Berkeley) 9/23/93
- * $Id$
+ * $Id: lfs.h,v 1.2 1994/08/02 07:54:28 davidg Exp $
  */
 
+#ifndef _UFS_LFS_LFS_H_
+#define _UFS_LFS_LFS_H_
+
 #define	LFS_LABELPAD	8192		/* LFS label size */
 #define	LFS_SBPAD	8192		/* LFS superblock size */
 
@@ -352,3 +355,5 @@ struct lfs_stats {
 };
 extern struct lfs_stats lfs_stats;
 #endif
+
+#endif
diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h
index c54b0d47ba6e..5b6db4fae13b 100644
--- a/sys/ufs/lfs/lfs_extern.h
+++ b/sys/ufs/lfs/lfs_extern.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_extern.h	8.2 (Berkeley) 4/16/94
- * $Id$
+ * $Id: lfs_extern.h,v 1.2 1994/08/02 07:54:34 davidg Exp $
  */
 
+#ifndef _UFS_LFS_LFS_EXTERN_H_
+#define _UFS_LFS_LFS_EXTERN_H_
+
 struct fid;
 struct mount;
 struct nameidata;
@@ -105,3 +108,5 @@ extern int (**lfs_fifoop_p)();
 #else
 #define LFS_FIFOOPS NULL
 #endif
+
+#endif
diff --git a/sys/ufs/mfs/mfs_extern.h b/sys/ufs/mfs/mfs_extern.h
index ec8b3f32a14e..fa51177ac9fe 100644
--- a/sys/ufs/mfs/mfs_extern.h
+++ b/sys/ufs/mfs/mfs_extern.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_extern.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: mfs_extern.h,v 1.2 1994/08/02 07:54:42 davidg Exp $
  */
 
+#ifndef _UFS_MFS_MFS_EXTERN_H_
+#define _UFS_MFS_MFS_EXTERN_H_
+
 struct buf;
 struct mount;
 struct nameidata;
@@ -59,3 +62,5 @@ int	mfs_start __P((struct mount *mp, int flags, struct proc *p));
 int	mfs_statfs __P((struct mount *mp, struct statfs *sbp, struct proc *p));
 int	mfs_strategy __P((struct vop_strategy_args *)); /* XXX */
 __END_DECLS
+
+#endif
diff --git a/sys/ufs/mfs/mfsiom.h b/sys/ufs/mfs/mfsiom.h
index 16eebbe474fd..a420aa3210c4 100644
--- a/sys/ufs/mfs/mfsiom.h
+++ b/sys/ufs/mfs/mfsiom.h
@@ -31,8 +31,13 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsiom.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: mfsiom.h,v 1.2 1994/08/02 07:54:45 davidg Exp $
  */
 
+#ifndef _UFS_MFS_MFSIOM_H_
+#define _UFS_MFS_MFSIOM_H_
+
 #define MFS_MAPREG	(MAXPHYS/NBPG + 2) /* Kernel mapping pte's */
 #define MFS_MAPSIZE	10		   /* Size of alloc map for pte's */
+
+#endif
diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h
index 886edd8cce8e..28d9254265cf 100644
--- a/sys/ufs/mfs/mfsnode.h
+++ b/sys/ufs/mfs/mfsnode.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsnode.h	8.2 (Berkeley) 8/11/93
- * $Id$
+ * $Id: mfsnode.h,v 1.2 1994/08/02 07:54:46 davidg Exp $
  */
 
+#ifndef _UFS_MFS_MFSNODE_H_
+#define _UFS_MFS_MFSNODE_H_
+
 /*
  * This structure defines the control data for the memory based file system.
  */
@@ -85,3 +88,5 @@ struct mfsnode {
 #define mfs_truncate ((int (*) __P((struct  vop_truncate_args *)))mfs_badop)
 #define mfs_update ((int (*) __P((struct  vop_update_args *)))mfs_badop)
 #define mfs_bwrite ((int (*) __P((struct  vop_bwrite_args *)))vn_bwrite)
+
+#endif
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index fc39dfb785c2..b91843b7a79e 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $Id$
+ * $Id: dinode.h,v 1.2 1994/08/02 07:54:47 davidg Exp $
  */
 
+#ifndef _UFS_UFS_DINODE_H_
+#define _UFS_UFS_DINODE_H_
+
 /*
  * The root inode is the root of the file system.  Inode 0 can't be used for
  * normal purposes and historically bad blocks were linked to inode 1, thus
@@ -107,3 +110,5 @@ struct dinode {
 #define	IFREG		0100000		/* Regular file. */
 #define	IFLNK		0120000		/* Symbolic link. */
 #define	IFSOCK		0140000		/* UNIX domain socket. */
+
+#endif
diff --git a/sys/ufs/ufs/dir.h b/sys/ufs/ufs/dir.h
index 6dca4dce8045..f18eca8dc8aa 100644
--- a/sys/ufs/ufs/dir.h
+++ b/sys/ufs/ufs/dir.h
@@ -36,11 +36,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)dir.h	8.2 (Berkeley) 1/21/94
- * $Id$
+ * $Id: dir.h,v 1.2 1994/08/02 07:54:48 davidg Exp $
  */
 
-#ifndef _DIR_H_
-#define	_DIR_H_
+#ifndef _UFS_UFS_DIR_H_
+#define	_UFS_UFS_DIR_H_
 
 /*
  * A directory consists of some number of blocks of DIRBLKSIZ
diff --git a/sys/ufs/ufs/inode.h b/sys/ufs/ufs/inode.h
index e37944321b47..cda8fb44b862 100644
--- a/sys/ufs/ufs/inode.h
+++ b/sys/ufs/ufs/inode.h
@@ -36,9 +36,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.4 (Berkeley) 1/21/94
- * $Id$
+ * $Id: inode.h,v 1.2 1994/08/02 07:54:49 davidg Exp $
  */
 
+#ifndef _UFS_UFS_INODE_H_
+#define _UFS_UFS_INODE_H_
+
 #include <ufs/ufs/dinode.h>
 
 /*
@@ -160,4 +163,6 @@ struct ufid {
 	ino_t	ufid_ino;	/* File number (ino). */
 	long	ufid_gen;	/* Generation number. */
 };
+
+#endif
 #endif /* KERNEL */
diff --git a/sys/ufs/ufs/quota.h b/sys/ufs/ufs/quota.h
index 039a6fd7075e..35dafa934cf3 100644
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
@@ -34,11 +34,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)quota.h	8.1 (Berkeley) 6/11/93
- * $Id$
+ * $Id: quota.h,v 1.2 1994/08/02 07:54:51 davidg Exp $
  */
 
-#ifndef _QUOTA_
-#define _QUOTA_
+#ifndef _UFS_UFS_QUOTA_
+#define _UFS_UFS_QUOTA_
 
 /*
  * Definitions for disk quotas imposed on the average user
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 590b343bb8f0..6ae7d18750a0 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.3 (Berkeley) 4/16/94
- * $Id$
+ * $Id: ufs_extern.h,v 1.2 1994/08/02 07:54:54 davidg Exp $
  */
 
+#ifndef _UFS_UFS_UFS_EXTERN_H_
+#define _UFS_UFS_UFS_EXTERN_H_
+
 struct buf;
 struct direct;
 struct disklabel;
@@ -124,3 +127,5 @@ int	ufsfifo_write __P((struct vop_write_args *));
 int	ufsfifo_close __P((struct vop_close_args *));
 #endif
 __END_DECLS
+
+#endif
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index 084abeb795d2..02fdff2eb3fa 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.2 (Berkeley) 1/12/94
- * $Id$
+ * $Id: ufsmount.h,v 1.2 1994/08/02 07:55:04 davidg Exp $
  */
 
+#ifndef _UFS_UFS_UFSMOUNT_H_
+#define _UFS_UFS_UFSMOUNT_H_
+
 struct buf;
 struct inode;
 struct nameidata;
@@ -81,4 +84,4 @@ struct ufsmount {
 #define	is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc)
 #define MNINDIR(ump)	((ump)->um_nindir)
 
-
+#endif
diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 818e1491a551..8a15cc34a689 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,9 +31,12 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id$
+ * $Id: vm_extern.h,v 1.3 1994/08/02 07:55:17 davidg Exp $
  */
 
+#ifndef _VM_VM_EXTERN_H_
+#define _VM_VM_EXTERN_H_
+
 struct buf;
 struct loadavg;
 struct proc;
@@ -134,3 +137,5 @@ boolean_t	 vnode_pager_uncache __P((struct vnode *));
 void		 vslock __P((caddr_t, u_int));
 void		 vsunlock __P((caddr_t, u_int, int));
 #endif
+
+#endif
diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h
index 66f0bbe9f76f..461a791d4197 100644
--- a/sys/vm/vm_pageout.h
+++ b/sys/vm/vm_pageout.h
@@ -61,9 +61,12 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.h,v 1.3 1994/08/02 07:55:34 davidg Exp $
+ * $Id: vm_pageout.h,v 1.4 1994/08/18 22:36:08 wollman Exp $
  */
 
+#ifndef _VM_VM_PAGEOUT_H_
+#define _VM_VM_PAGEOUT_H_
+
 /*
  *	Header file for pageout daemon.
  */
@@ -110,3 +113,5 @@ int		 vm_pageout_scan __P((void));
 void		 vm_pageout_page __P((vm_page_t, vm_object_t));
 void		 vm_pageout_cluster __P((vm_page_t, vm_object_t));
 #endif
+
+#endif