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, 11 insertions, 13 deletions

diff --git a/module/zfs/zpl_super.c b/module/zfs/zpl_super.c
index 92779bcab..b4e7b6ed0 100644
--- a/module/zfs/zpl_super.c
+++ b/module/zfs/zpl_super.c
@@ -44,7 +44,7 @@ zpl_inode_alloc(struct super_block *sb)
 static void
 zpl_inode_destroy(struct inode *ip)
 {
-        ASSERT(atomic_read(&ip->i_count) == 0);
+	ASSERT(atomic_read(&ip->i_count) == 0);
 	zfs_inode_destroy(ip);
 }
 
@@ -216,13 +216,13 @@ __zpl_show_options(struct seq_file *seq, zfs_sb_t *zsb)
 static int
 zpl_show_options(struct seq_file *seq, struct dentry *root)
 {
-	return __zpl_show_options(seq, root->d_sb->s_fs_info);
+	return (__zpl_show_options(seq, root->d_sb->s_fs_info));
 }
 #else
 static int
 zpl_show_options(struct seq_file *seq, struct vfsmount *vfsp)
 {
-	return __zpl_show_options(seq, vfsp->mnt_sb->s_fs_info);
+	return (__zpl_show_options(seq, vfsp->mnt_sb->s_fs_info));
 }
 #endif /* HAVE_SHOW_OPTIONS_WITH_DENTRY */
 
@@ -244,7 +244,7 @@ zpl_mount(struct file_system_type *fs_type, int flags,
 {
 	zpl_mount_data_t zmd = { osname, data };
 
-	return mount_nodev(fs_type, flags, &zmd, zpl_fill_super);
+	return (mount_nodev(fs_type, flags, &zmd, zpl_fill_super));
 }
 #else
 static int
@@ -253,7 +253,7 @@ zpl_get_sb(struct file_system_type *fs_type, int flags,
 {
 	zpl_mount_data_t zmd = { osname, data };
 
-	return get_sb_nodev(fs_type, flags, &zmd, zpl_fill_super, mnt);
+	return (get_sb_nodev(fs_type, flags, &zmd, zpl_fill_super, mnt));
 }
 #endif /* HAVE_MOUNT_NODEV */
 
@@ -287,14 +287,12 @@ zpl_prune_sb(struct super_block *sb, void *arg)
 
 	error = -zfs_sb_prune(sb, *(unsigned long *)arg, &objects);
 	ASSERT3S(error, <=, 0);
-
-	return;
 }
 
 void
 zpl_prune_sbs(int64_t bytes_to_scan, void *private)
 {
-	unsigned long nr_to_scan = (bytes_to_scan / sizeof(znode_t));
+	unsigned long nr_to_scan = (bytes_to_scan / sizeof (znode_t));
 
 	iterate_supers_type(&zpl_fs_type, zpl_prune_sb, &nr_to_scan);
 	kmem_reap();
@@ -311,11 +309,11 @@ zpl_prune_sbs(int64_t bytes_to_scan, void *private)
 void
 zpl_prune_sbs(int64_t bytes_to_scan, void *private)
 {
-	unsigned long nr_to_scan = (bytes_to_scan / sizeof(znode_t));
+	unsigned long nr_to_scan = (bytes_to_scan / sizeof (znode_t));
 
-        shrink_dcache_memory(nr_to_scan, GFP_KERNEL);
-        shrink_icache_memory(nr_to_scan, GFP_KERNEL);
-        kmem_reap();
+	shrink_dcache_memory(nr_to_scan, GFP_KERNEL);
+	shrink_icache_memory(nr_to_scan, GFP_KERNEL);
+	kmem_reap();
 }
 #endif /* HAVE_SHRINK */
 
@@ -344,7 +342,7 @@ zpl_nr_cached_objects(struct super_block *sb)
 static void
 zpl_free_cached_objects(struct super_block *sb, int nr_to_scan)
 {
-	arc_adjust_meta(nr_to_scan * sizeof(znode_t), B_FALSE);
+	arc_adjust_meta(nr_to_scan * sizeof (znode_t), B_FALSE);
 }
 #endif /* HAVE_FREE_CACHED_OBJECTS */