cstyle: Resolve C style issues

The vast majority of these changes are in Linux specific code.
They are the result of not having an automated style checker to
validate the code when it was originally written.  Others were
caused when the common code was slightly adjusted for Linux.

This patch contains no functional changes.  It only refreshes
the code to conform to style guide.

Everyone submitting patches for inclusion upstream should now
run 'make checkstyle' and resolve any warning prior to opening
a pull request.  The automated builders have been updated to
fail a build if when 'make checkstyle' detects an issue.

Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1821

1 files changed, 60 insertions, 53 deletions

diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h
index 6744ae614..82a7fdfd4 100644
--- a/include/zpios-ctl.h
+++ b/include/zpios-ctl.h
@@ -1,4 +1,4 @@
-/*****************************************************************************\
+/*
  *  ZPIOS is a heavily modified version of the original PIOS test code.
  *  It is designed to have the test code running in the Linux kernel
  *  against ZFS while still being flexibly controled from user space.
@@ -29,48 +29,49 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with ZPIOS.  If not, see <http://www.gnu.org/licenses/>.
-\*****************************************************************************/
+ */
 
 #ifndef _ZPIOS_CTL_H
-#define _ZPIOS_CTL_H
+#define	_ZPIOS_CTL_H
 
-/* Contains shared definitions which both the userspace
+/*
+ * Contains shared definitions which both the userspace
  * and kernelspace portions of zpios must agree on.
  */
 #ifndef _KERNEL
 #include <stdint.h>
 #endif
 
-#define ZPIOS_MAJOR			232 /* XXX - Arbitrary */
-#define ZPIOS_MINORS			1
-#define ZPIOS_NAME			"zpios"
-#define ZPIOS_DEV			"/dev/zpios"
-
-#define DMU_IO				0x01
-
-#define DMU_WRITE			0x0001
-#define DMU_READ			0x0002
-#define DMU_VERIFY			0x0004
-#define DMU_REMOVE			0x0008
-#define DMU_FPP				0x0010
-#define DMU_WRITE_ZC			0x0020 /* Incompatible w/DMU_VERIFY */
-#define DMU_READ_ZC			0x0040 /* Incompatible w/DMU_VERIFY */
-#define DMU_WRITE_NOWAIT		0x0080
-#define DMU_READ_NOPF			0x0100
-
-#define ZPIOS_NAME_SIZE			16
-#define ZPIOS_PATH_SIZE			128
-
-#define PHASE_PRE_RUN			"pre-run"
-#define PHASE_PRE_CREATE		"pre-create"
-#define PHASE_PRE_WRITE			"pre-write"
-#define PHASE_PRE_READ			"pre-read"
-#define PHASE_PRE_REMOVE		"pre-remove"
-#define PHASE_POST_RUN			"post-run"
-#define PHASE_POST_CREATE		"post-create"
-#define PHASE_POST_WRITE		"post-write"
-#define PHASE_POST_READ			"post-read"
-#define PHASE_POST_REMOVE		"post-remove"
+#define	ZPIOS_MAJOR			232 /* XXX - Arbitrary */
+#define	ZPIOS_MINORS			1
+#define	ZPIOS_NAME			"zpios"
+#define	ZPIOS_DEV			"/dev/zpios"
+
+#define	DMU_IO				0x01
+
+#define	DMU_WRITE			0x0001
+#define	DMU_READ			0x0002
+#define	DMU_VERIFY			0x0004
+#define	DMU_REMOVE			0x0008
+#define	DMU_FPP				0x0010
+#define	DMU_WRITE_ZC			0x0020 /* Incompatible w/DMU_VERIFY */
+#define	DMU_READ_ZC			0x0040 /* Incompatible w/DMU_VERIFY */
+#define	DMU_WRITE_NOWAIT		0x0080
+#define	DMU_READ_NOPF			0x0100
+
+#define	ZPIOS_NAME_SIZE			16
+#define	ZPIOS_PATH_SIZE			128
+
+#define	PHASE_PRE_RUN			"pre-run"
+#define	PHASE_PRE_CREATE		"pre-create"
+#define	PHASE_PRE_WRITE			"pre-write"
+#define	PHASE_PRE_READ			"pre-read"
+#define	PHASE_PRE_REMOVE		"pre-remove"
+#define	PHASE_POST_RUN			"post-run"
+#define	PHASE_POST_CREATE		"post-create"
+#define	PHASE_POST_WRITE		"post-write"
+#define	PHASE_POST_READ			"post-read"
+#define	PHASE_POST_REMOVE		"post-remove"
 
 #define	ZPIOS_CFG_MAGIC			0x87237190U
 typedef struct zpios_cfg {
@@ -117,27 +118,28 @@ typedef struct zpios_cmd {
 	uint32_t cmd_chunk_noise;	/* Chunk noise */
 	uint32_t cmd_thread_delay;	/* Thread delay */
 	uint32_t cmd_flags;		/* Test flags */
-        char cmd_pre[ZPIOS_PATH_SIZE];	/* Pre-exec hook */
-        char cmd_post[ZPIOS_PATH_SIZE];	/* Post-exec hook */
+	char cmd_pre[ZPIOS_PATH_SIZE];	/* Pre-exec hook */
+	char cmd_post[ZPIOS_PATH_SIZE];	/* Post-exec hook */
 	char cmd_log[ZPIOS_PATH_SIZE];  /* Requested log dir */
 	uint64_t cmd_data_size;		/* Opaque data size */
 	char cmd_data_str[0];		/* Opaque data region */
 } zpios_cmd_t;
 
 /* Valid ioctls */
-#define ZPIOS_CFG			_IOWR('f', 101, zpios_cfg_t)
-#define ZPIOS_CMD			_IOWR('f', 102, zpios_cmd_t)
+#define	ZPIOS_CFG			_IOWR('f', 101, zpios_cfg_t)
+#define	ZPIOS_CMD			_IOWR('f', 102, zpios_cmd_t)
 
 /* Valid configuration commands */
-#define ZPIOS_CFG_BUFFER_CLEAR		0x001	/* Clear text buffer */
-#define ZPIOS_CFG_BUFFER_SIZE		0x002	/* Resize text buffer */
+#define	ZPIOS_CFG_BUFFER_CLEAR		0x001	/* Clear text buffer */
+#define	ZPIOS_CFG_BUFFER_SIZE		0x002	/* Resize text buffer */
 
 #ifndef NSEC_PER_SEC
-#define NSEC_PER_SEC    1000000000L
+#define	NSEC_PER_SEC    1000000000L
 #endif
 
 static inline
-void zpios_timespec_normalize(zpios_timespec_t *ts, uint32_t sec, uint32_t nsec)
+void
+zpios_timespec_normalize(zpios_timespec_t *ts, uint32_t sec, uint32_t nsec)
 {
 	while (nsec >= NSEC_PER_SEC) {
 		nsec -= NSEC_PER_SEC;
@@ -152,27 +154,30 @@ void zpios_timespec_normalize(zpios_timespec_t *ts, uint32_t sec, uint32_t nsec)
 }
 
 static inline
-zpios_timespec_t zpios_timespec_add(zpios_timespec_t lhs, zpios_timespec_t rhs)
+zpios_timespec_t
+zpios_timespec_add(zpios_timespec_t lhs, zpios_timespec_t rhs)
 {
 	zpios_timespec_t ts_delta;
 	zpios_timespec_normalize(&ts_delta, lhs.ts_sec + rhs.ts_sec,
-	                         lhs.ts_nsec + rhs.ts_nsec);
-        return ts_delta;
+	    lhs.ts_nsec + rhs.ts_nsec);
+	return (ts_delta);
 }
 
 static inline
-zpios_timespec_t zpios_timespec_sub(zpios_timespec_t lhs, zpios_timespec_t rhs)
+zpios_timespec_t
+zpios_timespec_sub(zpios_timespec_t lhs, zpios_timespec_t rhs)
 {
 	zpios_timespec_t ts_delta;
 	zpios_timespec_normalize(&ts_delta, lhs.ts_sec - rhs.ts_sec,
-	                         lhs.ts_nsec - rhs.ts_nsec);
-	return ts_delta;
+	    lhs.ts_nsec - rhs.ts_nsec);
+	return (ts_delta);
 }
 
 #ifdef _KERNEL
 
 static inline
-zpios_timespec_t zpios_timespec_now(void)
+zpios_timespec_t
+zpios_timespec_now(void)
 {
 	zpios_timespec_t zts_now;
 	struct timespec ts_now;
@@ -181,16 +186,18 @@ zpios_timespec_t zpios_timespec_now(void)
 	zts_now.ts_sec  = ts_now.tv_sec;
 	zts_now.ts_nsec = ts_now.tv_nsec;
 
-	return zts_now;
+	return (zts_now);
 }
 
 #else
 
 static inline
-double zpios_timespec_to_double(zpios_timespec_t ts)
+double
+zpios_timespec_to_double(zpios_timespec_t ts)
 {
-	return ((double)(ts.ts_sec) +
-	       ((double)(ts.ts_nsec) / (double)(NSEC_PER_SEC)));
+	return
+	    ((double)(ts.ts_sec) +
+	    ((double)(ts.ts_nsec) / (double)(NSEC_PER_SEC)));
 }
 
 #endif /* _KERNEL */