From 458cec8aa069326f137fa33c3defcbbe50d182fd Mon Sep 17 00:00:00 2001
From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
Date: Sat, 8 Apr 2017 19:39:47 +0300
Subject: [PATCH] sys/vfs/hammer: Cleanups on CRC functions

Just sync style with other part of the same file.
---
 sys/vfs/hammer/hammer_crc.h | 76 +++++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 27 deletions(-)

diff --git a/sys/vfs/hammer/hammer_crc.h b/sys/vfs/hammer/hammer_crc.h
index 5fcf534d20..67a32be530 100644
--- a/sys/vfs/hammer/hammer_crc.h
+++ b/sys/vfs/hammer/hammer_crc.h
@@ -76,6 +76,9 @@ uint32_t iscsi_crc32_ext(const void *buf, size_t size, uint32_t ocrc);
 	(((vol_version) >= HAMMER_VOL_VERSION_SEVEN) ?		\
 	 iscsi_crc32_ext(buf, size, ocrc) : crc32_ext(buf, size, ocrc))
 
+/*
+ * Blockmap
+ */
 static __inline hammer_crc_t
 hammer_crc_get_blockmap(uint32_t vol_version, hammer_blockmap_t blockmap)
 {
@@ -92,16 +95,18 @@ static __inline int
 hammer_crc_test_blockmap(uint32_t vol_version, hammer_blockmap_t blockmap)
 {
 	if (blockmap->entry_crc == hammer_crc_get_blockmap(vol_version, blockmap))
-		return 1;
+		return(1);
 	if (vol_version >= HAMMER_VOL_VERSION_SEVEN) {
 		if (blockmap->entry_crc == hammer_crc_get_blockmap(HAMMER_VOL_VERSION_SIX,
-								   blockmap)) {
-			return 1;
-		}
+								   blockmap))
+			return(1);
 	}
-	return 0;
+	return(0);
 }
 
+/*
+ * Layer1
+ */
 static __inline hammer_crc_t
 hammer_crc_get_layer1(uint32_t vol_version, hammer_blockmap_layer1_t layer1)
 {
@@ -118,14 +123,17 @@ static __inline int
 hammer_crc_test_layer1(uint32_t vol_version, hammer_blockmap_layer1_t layer1)
 {
 	if (layer1->layer1_crc == hammer_crc_get_layer1(vol_version, layer1))
-		return 1;
+		return(1);
 	if (vol_version >= HAMMER_VOL_VERSION_SEVEN) {
 		if (layer1->layer1_crc == hammer_crc_get_layer1(HAMMER_VOL_VERSION_SIX, layer1))
-			return 1;
+			return(1);
 	}
-	return 0;
+	return(0);
 }
 
+/*
+ * Layer2
+ */
 static __inline hammer_crc_t
 hammer_crc_get_layer2(uint32_t vol_version, hammer_blockmap_layer2_t layer2)
 {
@@ -142,18 +150,21 @@ static __inline int
 hammer_crc_test_layer2(uint32_t vol_version, hammer_blockmap_layer2_t layer2)
 {
 	if (layer2->entry_crc == hammer_crc_get_layer2(vol_version, layer2))
-		return 1;
+		return(1);
 	if (vol_version >= HAMMER_VOL_VERSION_SEVEN) {
 		if (layer2->entry_crc == hammer_crc_get_layer2(HAMMER_VOL_VERSION_SIX, layer2))
-			return 1;
+			return(1);
 	}
-	return 0;
+	return(0);
 }
 
+/*
+ * Volume
+ */
 static __inline hammer_crc_t
 hammer_crc_get_volume(uint32_t vol_version, hammer_volume_ondisk_t ondisk)
 {
-	return (hammer_datacrc(vol_version, ondisk, HAMMER_VOL_CRCSIZE1) ^
+	return(hammer_datacrc(vol_version, ondisk, HAMMER_VOL_CRCSIZE1) ^
 		hammer_datacrc(vol_version, &ondisk->vol_crc + 1, HAMMER_VOL_CRCSIZE2));
 }
 
@@ -167,14 +178,17 @@ static __inline int
 hammer_crc_test_volume(uint32_t vol_version, hammer_volume_ondisk_t ondisk)
 {
 	if (ondisk->vol_crc == hammer_crc_get_volume(vol_version, ondisk))
-		return 1;
+		return(1);
 	if (vol_version >= HAMMER_VOL_VERSION_SEVEN) {
 		if (ondisk->vol_crc == hammer_crc_get_volume(HAMMER_VOL_VERSION_SIX, ondisk))
-			return 1;
+			return(1);
 	}
-	return 0;
+	return(0);
 }
 
+/*
+ * FIFO head
+ */
 static __inline hammer_crc_t
 hammer_crc_get_fifo_head(uint32_t vol_version, hammer_fifo_head_t head, int bytes)
 {
@@ -192,20 +206,22 @@ static __inline int
 hammer_crc_test_fifo_head(uint32_t vol_version, hammer_fifo_head_t head, int bytes)
 {
 	if (head->hdr_crc == hammer_crc_get_fifo_head(vol_version, head, bytes))
-		return 1;
+		return(1);
 	if (vol_version >= HAMMER_VOL_VERSION_SEVEN) {
 		if (head->hdr_crc == hammer_crc_get_fifo_head(HAMMER_VOL_VERSION_SIX,
-							      head, bytes)) {
-			return 1;
-		}
+							      head, bytes))
+			return(1);
 	}
-	return 0;
+	return(0);
 }
 
+/*
+ * B-Tree node
+ */
 static __inline hammer_crc_t
 hammer_crc_get_btree(uint32_t vol_version, hammer_node_ondisk_t node)
 {
-	return (hammer_datacrc(vol_version, &node->crc + 1, HAMMER_BTREE_CRCSIZE));
+	return(hammer_datacrc(vol_version, &node->crc + 1, HAMMER_BTREE_CRCSIZE));
 }
 
 static __inline void
@@ -218,15 +234,18 @@ static __inline int
 hammer_crc_test_btree(uint32_t vol_version, hammer_node_ondisk_t node)
 {
 	if (node->crc == hammer_crc_get_btree(vol_version, node))
-		return 1;
+		return(1);
 	if (vol_version >= HAMMER_VOL_VERSION_SEVEN) {
 		if (node->crc == hammer_crc_get_btree(HAMMER_VOL_VERSION_SIX, node))
-			return 1;
+			return(1);
 	}
-	return 0;
+	return(0);
 }
 
 /*
+ * B-Tree leaf elm
+ */
+/*
  * Get the leaf->data_crc field.  Deal with any special cases given
  * a generic B-Tree leaf element and its data.
  *
@@ -270,14 +289,17 @@ static __inline int
 hammer_crc_test_leaf(uint32_t vol_version, void *data, hammer_btree_leaf_elm_t leaf)
 {
 	if (leaf->data_crc == hammer_crc_get_leaf(vol_version, data, leaf))
-		return 1;
+		return(1);
 	if (vol_version >= HAMMER_VOL_VERSION_SEVEN) {
 		if (leaf->data_crc == hammer_crc_get_leaf(HAMMER_VOL_VERSION_SIX, data, leaf))
-			return 1;
+			return(1);
 	}
-	return 0;
+	return(0);
 }
 
+/*
+ * Mirror record head
+ */
 static __inline hammer_crc_t
 hammer_crc_get_mrec_head(hammer_ioc_mrecord_head_t head, int bytes)
 {
-- 
2.11.4.GIT