From 964cb30d14a62dc50aaf28b05dc40da7136ea1f4 Mon Sep 17 00:00:00 2001
From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Sun, 6 Sep 2015 04:00:56 +0900
Subject: [PATCH] sys/vfs/hammer: Add ifndef/define/endif for headers

Some headers are missing this, so add it to those.
---
 sys/vfs/hammer/hammer.h        | 6 ++++++
 sys/vfs/hammer/hammer_btree.h  | 5 +++++
 sys/vfs/hammer/hammer_cursor.h | 4 ++++
 sys/vfs/hammer/hammer_disk.h   | 2 +-
 sys/vfs/hammer/hammer_ioctl.h  | 2 +-
 sys/vfs/hammer/hammer_mount.h  | 4 ++++
 6 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/sys/vfs/hammer/hammer.h b/sys/vfs/hammer/hammer.h
index c47889faf0..7cacd2c1c3 100644
--- a/sys/vfs/hammer/hammer.h
+++ b/sys/vfs/hammer/hammer.h
@@ -31,6 +31,10 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+
+#ifndef VFS_HAMMER_HAMMER_H_
+#define VFS_HAMMER_HAMMER_H_
+
 /*
  * This header file contains structures used internally by the HAMMERFS
  * implementation.  See hammer_disk.h for on-disk structures.
@@ -1695,3 +1699,5 @@ hammer_dir_localization(hammer_inode_t dip)
 		return(HAMMER_LOCALIZE_MISC);
 }
 #endif  /* _KERNEL */
+
+#endif /* !VFS_HAMMER_HAMMER_H_ */
diff --git a/sys/vfs/hammer/hammer_btree.h b/sys/vfs/hammer/hammer_btree.h
index 1696b35012..38fa4d5e13 100644
--- a/sys/vfs/hammer/hammer_btree.h
+++ b/sys/vfs/hammer/hammer_btree.h
@@ -34,6 +34,9 @@
  * $DragonFly: src/sys/vfs/hammer/hammer_btree.h,v 1.24 2008/06/26 04:06:22 dillon Exp $
  */
 
+#ifndef VFS_HAMMER_BTREE_H_
+#define VFS_HAMMER_BTREE_H_
+
 /*
  * HAMMER B-Tree index
  *
@@ -294,3 +297,5 @@ struct hammer_node_ondisk {
 	(sizeof(struct hammer_node_ondisk) - sizeof(hammer_crc_t))
 
 typedef struct hammer_node_ondisk *hammer_node_ondisk_t;
+
+#endif /* !VFS_HAMMER_BTREE_H_ */
diff --git a/sys/vfs/hammer/hammer_cursor.h b/sys/vfs/hammer/hammer_cursor.h
index b3b766b279..760c5316c3 100644
--- a/sys/vfs/hammer/hammer_cursor.h
+++ b/sys/vfs/hammer/hammer_cursor.h
@@ -34,6 +34,9 @@
  * $DragonFly: src/sys/vfs/hammer/hammer_cursor.h,v 1.26 2008/08/06 15:38:58 dillon Exp $
  */
 
+#ifndef VFS_HAMMER_CURSOR_H_
+#define VFS_HAMMER_CURSOR_H_
+
 struct hammer_cmirror;
 
 /*
@@ -172,3 +175,4 @@ struct hammer_cmirror {
 #define hammer_cursor_ondisk(cursor)		\
 			((cursor)->leaf != &(cursor)->iprec->leaf)
 
+#endif /* !VFS_HAMMER_CURSOR_H_ */
diff --git a/sys/vfs/hammer/hammer_disk.h b/sys/vfs/hammer/hammer_disk.h
index ac1ce4d89f..fe66daaa50 100644
--- a/sys/vfs/hammer/hammer_disk.h
+++ b/sys/vfs/hammer/hammer_disk.h
@@ -908,4 +908,4 @@ typedef union hammer_data_ondisk *hammer_data_ondisk_t;
  * Ondisk layout of B-Tree related structures
  */
 #include "hammer_btree.h"
-#endif
+#endif /* !VFS_HAMMER_DISK_H_ */
diff --git a/sys/vfs/hammer/hammer_ioctl.h b/sys/vfs/hammer/hammer_ioctl.h
index b6b9489327..3cc3f49442 100644
--- a/sys/vfs/hammer/hammer_ioctl.h
+++ b/sys/vfs/hammer/hammer_ioctl.h
@@ -509,5 +509,5 @@ struct hammer_ioc_data {
 #define HAMMERIOC_LIST_VOLUMES	_IOWR('h',27,struct hammer_ioc_volume_list)
 #define HAMMERIOC_PFS_ITERATE	_IOWR('h',28,struct hammer_ioc_pfs_iterate)
 
-#endif
+#endif /* !VFS_HAMMER_IOCTL_H_ */
 
diff --git a/sys/vfs/hammer/hammer_mount.h b/sys/vfs/hammer/hammer_mount.h
index 7d6170048d..3d0d2270f5 100644
--- a/sys/vfs/hammer/hammer_mount.h
+++ b/sys/vfs/hammer/hammer_mount.h
@@ -34,6 +34,9 @@
  * $DragonFly: src/sys/vfs/hammer/hammer_mount.h,v 1.11 2008/09/17 21:44:20 dillon Exp $
  */
 
+#ifndef VFS_HAMMER_MOUNT_H_
+#define VFS_HAMMER_MOUNT_H_
+
 #ifndef _SYS_TYPES_H_
 #include <sys/types.h>
 #endif
@@ -62,3 +65,4 @@ struct hammer_mount_info {
 
 #define HMNT_USERFLAGS	(HMNT_NOHISTORY | HMNT_MASTERID)
 
+#endif /* !VFS_HAMMER_MOUNT_H_ */
-- 
2.41.0