From 23e66b3b16937f4a13761b4fc2f7578b1314a90c Mon Sep 17 00:00:00 2001
From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Thu, 30 Apr 2015 00:21:56 +0900
Subject: [PATCH] sys/vfs/hammer: Cleanup ifdef/else in hammer.h [2/2]

- 872a7eee introduced hammer.h to userspace using ifdef/else switches
  that needs to be cleaned up. It ended up that everything in hammer.h
  was kernel stuff. Userspace needs this header only to include other
  hammer headers that are already available in userspace.

- hunk 1,2 - Cleanup and conform to style(9).

- hunk 3,4 - Userspace doesn't need HAMMER_CHKSPC_XXX. These are only
  internally used by big block allocator.

- hunk 5,6 - Userspace doesn't need hammer_modify_xxx(). These are only
  internally used to begin i/o and generate undo for some meta data.
---
 sys/vfs/hammer/hammer.h | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sys/vfs/hammer/hammer.h b/sys/vfs/hammer/hammer.h
index 2c46a02514..9f6cf5d6c6 100644
--- a/sys/vfs/hammer/hammer.h
+++ b/sys/vfs/hammer/hammer.h
@@ -37,14 +37,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/types.h>
 #ifdef _KERNEL
 #include <sys/kernel.h>
-#endif
-#include <sys/conf.h>
-#ifdef _KERNEL
 #include <sys/systm.h>
 #endif
+#include <sys/conf.h>
 #include <sys/tree.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
@@ -61,8 +58,8 @@
 #include <sys/limits.h>
 #include <vm/vm_extern.h>
 
-#include <sys/buf2.h>
 #ifdef _KERNEL
+#include <sys/buf2.h>
 #include <sys/signal2.h>
 #include <vm/vm_page2.h>
 #endif
@@ -985,6 +982,7 @@ struct hammer_sync_info {
 
 #endif  /* _KERNEL || _KERNEL_STRUCTURES */
 
+#if defined(_KERNEL)
 /*
  * checkspace slop (8MB chunks), higher numbers are more conservative.
  */
@@ -995,8 +993,6 @@ struct hammer_sync_info {
 #define HAMMER_CHKSPC_REMOVE	10
 #define HAMMER_CHKSPC_EMERGENCY	0
 
-#if defined(_KERNEL)
-
 extern struct vop_ops hammer_vnode_vops;
 extern struct vop_ops hammer_spec_vops;
 extern struct vop_ops hammer_fifo_vops;
@@ -1643,7 +1639,6 @@ hammer_blockmap_lookup(hammer_mount_t hmp, hammer_off_t zone_offset,
 
 	return hammer_blockmap_lookup_verify(hmp, zone_offset, errorp);
 }
-#endif  /* _KERNEL */
 
 #define hammer_modify_volume_field(trans, vol, field)		\
 	hammer_modify_volume(trans, vol, &(vol)->ondisk->field,	\
@@ -1653,7 +1648,6 @@ hammer_blockmap_lookup(hammer_mount_t hmp, hammer_off_t zone_offset,
 	hammer_modify_node(trans, node, &(node)->ondisk->field,	\
 			     sizeof((node)->ondisk->field))
 
-#ifdef _KERNEL
 /*
  * The HAMMER_INODE_CAP_DIR_LOCAL_INO capability is set on newly
  * created directories for HAMMER version 2 or greater and causes
-- 
2.41.0