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

cmd/mount_zfs/mount_zfs.c

@@ -272,7 +272,7 @@ parse_dataset(char *dataset)
 	len = strlen(cwd);
 
 	/* Do not add one when cwd already ends in a trailing '/' */
-	if (!strncmp(cwd, dataset, len))
+	if (strncmp(cwd, dataset, len) == 0)
 		return (dataset + len + (cwd[len-1] != '/'));
 
 	return (dataset);
@@ -444,11 +444,11 @@ main(int argc, char **argv)
 	 * done until zfs is added to the default selinux policy configuration
 	 * as a known filesystem type which supports xattrs.
 	 */
-        if (is_selinux_enabled() && !(zfsflags & ZS_NOCONTEXT)) {
-                (void) strlcat(mntopts, ",context=\"system_u:"
-                    "object_r:file_t:s0\"", sizeof (mntopts));
-                (void) strlcat(mtabopt, ",context=\"system_u:"
-                    "object_r:file_t:s0\"", sizeof (mtabopt));
+	if (is_selinux_enabled() && !(zfsflags & ZS_NOCONTEXT)) {
+		(void) strlcat(mntopts, ",context=\"system_u:"
+		    "object_r:file_t:s0\"", sizeof (mntopts));
+		(void) strlcat(mtabopt, ",context=\"system_u:"
+		    "object_r:file_t:s0\"", sizeof (mtabopt));
 	}
 #endif /* HAVE_LIBSELINUX */
 
@@ -501,12 +501,12 @@ main(int argc, char **argv)
 	 * using zfs as your root file system both rc.sysinit/umountroot and
 	 * systemd depend on 'mount -o remount <mountpoint>' to work.
 	 */
-	if (zfsutil && !strcmp(legacy, ZFS_MOUNTPOINT_LEGACY)) {
+	if (zfsutil && (strcmp(legacy, ZFS_MOUNTPOINT_LEGACY) == 0)) {
 		(void) fprintf(stderr, gettext(
 		    "filesystem '%s' cannot be mounted using 'zfs mount'.\n"
 		    "Use 'zfs set mountpoint=%s' or 'mount -t zfs %s %s'.\n"
 		    "See zfs(8) for more information.\n"),
-		   dataset, mntpoint, dataset, mntpoint);
+		    dataset, mntpoint, dataset, mntpoint);
 		return (MOUNT_USAGE);
 	}
 

cmd/zdb/zdb.c

@@ -165,7 +165,8 @@ usage(void)
 	(void) fprintf(stderr, "        -t <txg> -- highest txg to use when "
 	    "searching for uberblocks\n");
 	(void) fprintf(stderr, "        -M <number of inflight I/Os> -- "
-	    "specify the maximum number of checksumming I/Os [default is 200]\n");
+	    "specify the maximum number of checksumming I/Os "
+	    "[default is 200]\n");
 	(void) fprintf(stderr, "Specify an option more than once (e.g. -bb) "
 	    "to make only that option verbose\n");
 	(void) fprintf(stderr, "Default is to dump everything non-verbosely\n");
@@ -1319,7 +1320,8 @@ dump_deadlist(dsl_deadlist_t *dl)
 	    dle = AVL_NEXT(&dl->dl_tree, dle)) {
 		if (dump_opt['d'] >= 5) {
 			char buf[128];
-			(void) snprintf(buf, sizeof (buf), "mintxg %llu -> obj %llu",
+			(void) snprintf(buf, sizeof (buf),
+			    "mintxg %llu -> obj %llu",
 			    (longlong_t)dle->dle_mintxg,
 			    (longlong_t)dle->dle_bpobj.bpo_object);
 
@@ -1436,7 +1438,7 @@ dump_znode_sa_xattr(sa_handle_t *hdl)
 
 		(void) printf("\t\t%s = ", nvpair_name(elem));
 		nvpair_value_byte_array(elem, &value, &cnt);
-		for (idx = 0 ; idx < cnt ; ++idx) {
+		for (idx = 0; idx < cnt; ++idx) {
 			if (isprint(value[idx]))
 				(void) putchar(value[idx]);
 			else
@@ -2394,7 +2396,7 @@ dump_block_stats(spa_t *spa)
 	 * it's not part of any space map) is a double allocation,
 	 * reference to a freed block, or an unclaimed log block.
 	 */
-	bzero(&zcb, sizeof(zdb_cb_t));
+	bzero(&zcb, sizeof (zdb_cb_t));
 	zdb_leak_init(spa, &zcb);
 
 	/*

cmd/zfs/zfs_iter.c

@@ -313,8 +313,8 @@ zfs_sort(const void *larg, const void *rarg, void *data)
 		} else if (psc->sc_prop == ZFS_PROP_NAME) {
 			lvalid = rvalid = B_TRUE;
 
-			(void) strlcpy(lbuf, zfs_get_name(l), sizeof(lbuf));
-			(void) strlcpy(rbuf, zfs_get_name(r), sizeof(rbuf));
+			(void) strlcpy(lbuf, zfs_get_name(l), sizeof (lbuf));
+			(void) strlcpy(rbuf, zfs_get_name(r), sizeof (rbuf));
 
 			lstr = lbuf;
 			rstr = rbuf;

cmd/zfs/zfs_main.c

@@ -2879,13 +2879,13 @@ print_dataset(zfs_handle_t *zhp, list_cbdata_t *cb)
 
 		if (pl->pl_prop == ZFS_PROP_NAME) {
 			(void) strlcpy(property, zfs_get_name(zhp),
-			    sizeof(property));
+			    sizeof (property));
 			propstr = property;
 			right_justify = zfs_prop_align_right(pl->pl_prop);
 		} else if (pl->pl_prop != ZPROP_INVAL) {
 			if (zfs_prop_get(zhp, pl->pl_prop, property,
 			    sizeof (property), NULL, NULL, 0,
-                            cb->cb_literal) != 0)
+			    cb->cb_literal) != 0)
 				propstr = "-";
 			else
 				propstr = property;

cmd/zpios/zpios.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,73 +29,74 @@
  *
  *  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_H
-#define _ZPIOS_H
+#define	_ZPIOS_H
 
 #include <zpios-ctl.h>
 
-#define VERSION_SIZE		64
+#define	VERSION_SIZE		64
 
 /* Regular expressions */
-#define REGEX_NUMBERS		"^[0-9]*[0-9]$"
-#define REGEX_NUMBERS_COMMA	"^([0-9]+,)*[0-9]+$"
-#define REGEX_SIZE		"^[0-9][0-9]*[kmgt]$"
-#define REGEX_SIZE_COMMA	"^([0-9][0-9]*[kmgt]+,)*[0-9][0-9]*[kmgt]$"
+#define	REGEX_NUMBERS		"^[0-9]*[0-9]$"
+#define	REGEX_NUMBERS_COMMA	"^([0-9]+,)*[0-9]+$"
+#define	REGEX_SIZE		"^[0-9][0-9]*[kmgt]$"
+#define	REGEX_SIZE_COMMA	"^([0-9][0-9]*[kmgt]+,)*[0-9][0-9]*[kmgt]$"
 
 /* Flags for low, high, incr */
-#define FLAG_SET		0x01
-#define FLAG_LOW		0x02
-#define FLAG_HIGH		0x04
-#define FLAG_INCR		0x08
+#define	FLAG_SET		0x01
+#define	FLAG_LOW		0x02
+#define	FLAG_HIGH		0x04
+#define	FLAG_INCR		0x08
 
-#define TRUE			1
-#define FALSE			0
+#define	TRUE			1
+#define	FALSE			0
 
-#define KB			(1024)
-#define MB			(KB * 1024)
-#define GB			(MB * 1024)
-#define TB			(GB * 1024)
+#define	KB			(1024)
+#define	MB			(KB * 1024)
+#define	GB			(MB * 1024)
+#define	TB			(GB * 1024)
 
-#define KMGT_SIZE		16
+#define	KMGT_SIZE		16
 
-/* All offsets, sizes and counts can be passed to the application in
+/*
+ * All offsets, sizes and counts can be passed to the application in
  * multiple ways.
  * 1. a value (stored in val[0], val_count will be 1)
  * 2. a comma separated list of values (stored in val[], using val_count)
  * 3. a range and block sizes, low, high, factor (val_count must be 0)
  */
 typedef struct pios_range_repeat {
-	uint64_t val[32];        /* Comma sep array, or low, high, inc */
-	uint64_t val_count;      /* Num of values */
+	uint64_t val[32];		/* Comma sep array, or low, high, inc */
+	uint64_t val_count;		/* Num of values */
 	uint64_t val_low;
 	uint64_t val_high;
 	uint64_t val_inc_perc;
-	uint64_t next_val;       /* Used for multiple runs in get_next() */
+	uint64_t next_val;		/* For multiple runs in get_next() */
 } range_repeat_t;
 
 typedef struct cmd_args {
-	range_repeat_t T;           /* Thread count */
-	range_repeat_t N;           /* Region count */
-	range_repeat_t O;           /* Offset count */
-	range_repeat_t C;           /* Chunksize */
-	range_repeat_t S;           /* Regionsize */
-
-	const char *pool;           /* Pool */
-	const char *name;           /* Name */
-	uint32_t flags;             /* Flags */
-	uint32_t io_type;           /* DMUIO only */
-	uint32_t verbose;           /* Verbose */
-	uint32_t human_readable;    /* Human readable output */
-
-	uint64_t regionnoise;       /* Region noise */
-	uint64_t chunknoise;        /* Chunk noise */
-	uint64_t thread_delay;      /* Thread delay */
-
-	char pre[ZPIOS_PATH_SIZE];  /* Pre-exec hook */
-	char post[ZPIOS_PATH_SIZE]; /* Post-exec hook */
-	char log[ZPIOS_PATH_SIZE];  /* Requested log dir */
+	range_repeat_t T;		/* Thread count */
+	range_repeat_t N;		/* Region count */
+	range_repeat_t O;		/* Offset count */
+	range_repeat_t C;		/* Chunksize */
+	range_repeat_t S;		/* Regionsize */
+
+	const char *pool;		/* Pool */
+	const char *name;		/* Name */
+	uint32_t flags;			/* Flags */
+	uint32_t io_type;		/* DMUIO only */
+	uint32_t verbose;		/* Verbose */
+	uint32_t human_readable;	/* Human readable output */
+
+	uint64_t regionnoise;		/* Region noise */
+	uint64_t chunknoise;		/* Chunk noise */
+	uint64_t thread_delay;		/* Thread delay */
+
+	char pre[ZPIOS_PATH_SIZE];	/* Pre-exec hook */
+	char post[ZPIOS_PATH_SIZE];	/* Post-exec hook */
+	char log[ZPIOS_PATH_SIZE];	/* Requested log dir */
 
 	/* Control */
 	int current_id;
@@ -109,9 +110,9 @@ typedef struct cmd_args {
 } cmd_args_t;
 
 int set_count(char *pattern1, char *pattern2, range_repeat_t *range,
-	      char *optarg, uint32_t *flags, char *arg);
+    char *optarg, uint32_t *flags, char *arg);
 int set_lhi(char *pattern, range_repeat_t *range, char *optarg,
-	    int flag, uint32_t *flag_thread, char *arg);
+    int flag, uint32_t *flag_thread, char *arg);
 int set_noise(uint64_t *noise, char *optarg, char *arg);
 int set_load_params(cmd_args_t *args, char *optarg);
 int check_mutual_exclusive_command_lines(uint32_t flag, char *arg);