OpenZFS 6328 - Fix cstyle errors in zfs codebase

Authored by: Paul Dagnelie <pcd@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Alex Reece <alex@delphix.com>
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Jorgen Lundman <lundman@lundman.net>
Approved by: Robert Mustacchi <rm@joyent.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Ported-by: George Melikov <mail@gmelikov.ru>
OpenZFS-issue: https://www.illumos.org/issues/6328
OpenZFS-commit: https://github.com/illumos/illumos-gate/commit/9a686fb
Closes #5579

diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
index f4873cf196a68d99304e608cf259c2056333b302..a96c3c6e26673917d97648f6bfca4153287e8a13 100644 (file)
--- a/cmd/zpool/zpool_main.c
+++ b/cmd/zpool/zpool_main.c
@@ -279,7 +279,8 @@ static boolean_t log_history = B_TRUE;
 static uint_t timestamp_fmt = NODATE;
 
 static const char *
-get_usage(zpool_help_t idx) {
+get_usage(zpool_help_t idx)
+{
        switch (idx) {
        case HELP_ADD:
                return (gettext("\tadd [-fgLnP] [-o property=value] "

diff --git a/include/sys/zrlock.h b/include/sys/zrlock.h
index dcd63f7b5b91f506449776b43df5ba94a58812a9..b6eba1a18ff45f2c4678d1df55a5e31ead666c03 100644 (file)
--- a/include/sys/zrlock.h
+++ b/include/sys/zrlock.h
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 #ifndef        _SYS_ZRLOCK_H
@@ -44,12 +45,8 @@ typedef struct zrlock {
 
 extern void zrl_init(zrlock_t *);
 extern void zrl_destroy(zrlock_t *);
-#ifdef ZFS_DEBUG
-#define        zrl_add(_z)     zrl_add_debug((_z), __func__)
-extern void zrl_add_debug(zrlock_t *, const char *);
-#else
-extern void zrl_add(zrlock_t *);
-#endif
+#define        zrl_add(_z)     zrl_add_impl((_z), __func__)
+extern void zrl_add_impl(zrlock_t *, const char *);
 extern void zrl_remove(zrlock_t *);
 extern int zrl_tryenter(zrlock_t *);
 extern void zrl_exit(zrlock_t *);

diff --git a/lib/libzfs/libzfs_iter.c b/lib/libzfs/libzfs_iter.c
index c656db6fc6b56e5882aa081a0cc700ef724d4ed4..e22a2c85b140dcec379b8b5a168e5931b84c00ad 100644 (file)
--- a/lib/libzfs/libzfs_iter.c
+++ b/lib/libzfs/libzfs_iter.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  * Copyright 2014 Nexenta Systems, Inc.  All rights reserved.
  */
 
@@ -309,7 +309,8 @@ typedef struct {
 } snapspec_arg_t;
 
 static int
-snapspec_cb(zfs_handle_t *zhp, void *arg) {
+snapspec_cb(zfs_handle_t *zhp, void *arg)
+{
        snapspec_arg_t *ssa = arg;
        char *shortsnapname;
        int err = 0;

diff --git a/lib/libzpool/kernel.c b/lib/libzpool/kernel.c
index bda9d01fe7ba02fb1573004b05db106927cfe0a2..b0418cb0956ccd7a18b70e0981a5ceb95d315200 100644 (file)
--- a/lib/libzpool/kernel.c
+++ b/lib/libzpool/kernel.c
@@ -737,7 +737,7 @@ vn_openat(char *path, int x1, int flags, int mode, vnode_t **vpp, int x2,
 /*ARGSUSED*/
 int
 vn_rdwr(int uio, vnode_t *vp, void *addr, ssize_t len, offset_t offset,
-       int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp)
+    int x1, int x2, rlim64_t x3, void *x4, ssize_t *residp)
 {
        ssize_t rc, done = 0, split;
 

diff --git a/module/zfs/dsl_dataset.c b/module/zfs/dsl_dataset.c
index 8abb510e8ed931e412c53f2b2d3df7c40952e0b7..c09f1913759d4939510c12d844d093e4c237de81 100644 (file)
--- a/module/zfs/dsl_dataset.c
+++ b/module/zfs/dsl_dataset.c
@@ -3550,7 +3550,7 @@ dsl_dataset_space_wouldfree(dsl_dataset_t *firstsnap,
  */
 boolean_t
 dsl_dataset_is_before(dsl_dataset_t *later, dsl_dataset_t *earlier,
-       uint64_t earlier_txg)
+    uint64_t earlier_txg)
 {
        dsl_pool_t *dp = later->ds_dir->dd_pool;
        int error;

diff --git a/module/zfs/space_reftree.c b/module/zfs/space_reftree.c
index efbf95099eab22d38c4a5707e99dba37dc1ba5b1..038572b08873abe29637db1be1bdfc609e7d75b3 100644 (file)
--- a/module/zfs/space_reftree.c
+++ b/module/zfs/space_reftree.c
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -97,7 +97,7 @@ space_reftree_add_node(avl_tree_t *t, uint64_t offset, int64_t refcnt)
 
 void
 space_reftree_add_seg(avl_tree_t *t, uint64_t start, uint64_t end,
-       int64_t refcnt)
+    int64_t refcnt)
 {
        space_reftree_add_node(t, start, refcnt);
        space_reftree_add_node(t, end, -refcnt);

diff --git a/module/zfs/vdev_label.c b/module/zfs/vdev_label.c
index 7a3a0e8a06445b905b27b5bd33b6831885721d5c..54c54237bfd5885ead5cec504b56257c12571fdc 100644 (file)
--- a/module/zfs/vdev_label.c
+++ b/module/zfs/vdev_label.c
@@ -21,7 +21,7 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2012, 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -180,7 +180,7 @@ vdev_label_number(uint64_t psize, uint64_t offset)
 
 static void
 vdev_label_read(zio_t *zio, vdev_t *vd, int l, abd_t *buf, uint64_t offset,
-       uint64_t size, zio_done_func_t *done, void *private, int flags)
+    uint64_t size, zio_done_func_t *done, void *private, int flags)
 {
        ASSERT(spa_config_held(zio->io_spa, SCL_STATE_ALL, RW_WRITER) ==
            SCL_STATE_ALL);
@@ -194,7 +194,7 @@ vdev_label_read(zio_t *zio, vdev_t *vd, int l, abd_t *buf, uint64_t offset,
 
 static void
 vdev_label_write(zio_t *zio, vdev_t *vd, int l, abd_t *buf, uint64_t offset,
-       uint64_t size, zio_done_func_t *done, void *private, int flags)
+    uint64_t size, zio_done_func_t *done, void *private, int flags)
 {
        ASSERT(spa_config_held(zio->io_spa, SCL_ALL, RW_WRITER) == SCL_ALL ||
            (spa_config_held(zio->io_spa, SCL_CONFIG | SCL_STATE, RW_READER) ==

diff --git a/module/zfs/zap_leaf.c b/module/zfs/zap_leaf.c
index 3abc08cff476f09c634567a6681d236b75c82ec3..c9837981d89eb4b76c386341b62a193bc4be3c2f 100644 (file)
--- a/module/zfs/zap_leaf.c
+++ b/module/zfs/zap_leaf.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  */
 
 /*
@@ -538,7 +538,7 @@ zap_entry_read_name(zap_t *zap, const zap_entry_handle_t *zeh, uint16_t buflen,
 
 int
 zap_entry_update(zap_entry_handle_t *zeh,
-       uint8_t integer_size, uint64_t num_integers, const void *buf)
+    uint8_t integer_size, uint64_t num_integers, const void *buf)
 {
        int delta_chunks;
        zap_leaf_t *l = zeh->zeh_leaf;

diff --git a/module/zfs/zfeature.c b/module/zfs/zfeature.c
index bda9548293d0184bce777749a1ab30a06471dff6..d8220aa235a816b8e4f31cb95b278a1622a680eb 100644 (file)
--- a/module/zfs/zfeature.c
+++ b/module/zfs/zfeature.c
@@ -277,7 +277,8 @@ feature_get_refcount_from_disk(spa_t *spa, zfeature_info_t *feature,
 
 
 static int
-feature_get_enabled_txg(spa_t *spa, zfeature_info_t *feature, uint64_t *res) {
+feature_get_enabled_txg(spa_t *spa, zfeature_info_t *feature, uint64_t *res)
+{
        ASSERTV(uint64_t enabled_txg_obj = spa->spa_feat_enabled_txg_obj);
 
        ASSERT(zfeature_depends_on(feature->fi_feature,
@@ -500,7 +501,8 @@ spa_feature_is_active(spa_t *spa, spa_feature_t fid)
  * Returns B_FALSE otherwise (i.e. if the feature is not enabled).
  */
 boolean_t
-spa_feature_enabled_txg(spa_t *spa, spa_feature_t fid, uint64_t *txg) {
+spa_feature_enabled_txg(spa_t *spa, spa_feature_t fid, uint64_t *txg)
+{
        int err;
 
        ASSERT(VALID_FEATURE_FID(fid));

diff --git a/module/zfs/zfeature_common.c b/module/zfs/zfeature_common.c
index ccd65a7b74d9eeacaea22849041f9166d6c93cec..0459d45219e4adaa5ca2b8998f3d279267b9da0d 100644 (file)
--- a/module/zfs/zfeature_common.c
+++ b/module/zfs/zfeature_common.c
@@ -122,7 +122,8 @@ zfeature_lookup_name(const char *name, spa_feature_t *res)
 }
 
 boolean_t
-zfeature_depends_on(spa_feature_t fid, spa_feature_t check) {
+zfeature_depends_on(spa_feature_t fid, spa_feature_t check)
+{
        zfeature_info_t *feature = &spa_feature_table[fid];
        int i;
 

diff --git a/module/zfs/zfs_dir.c b/module/zfs/zfs_dir.c
index c28b85c98f8bbaac13f098f462cdf987d8070057..b66a9b36476c668bedb01095b1eae5d0489ae852 100644 (file)
--- a/module/zfs/zfs_dir.c
+++ b/module/zfs/zfs_dir.c
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2013, 2014 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  */
 
 
@@ -838,7 +838,7 @@ zfs_dropname(zfs_dirlock_t *dl, znode_t *zp, znode_t *dzp, dmu_tx_t *tx,
  */
 int
 zfs_link_destroy(zfs_dirlock_t *dl, znode_t *zp, dmu_tx_t *tx, int flag,
-       boolean_t *unlinkedp)
+    boolean_t *unlinkedp)
 {
        znode_t *dzp = dl->dl_dzp;
        zfs_sb_t *zsb = ZTOZSB(dzp);

diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 98ab745f8cf6895d0351fa5a61e3e1539dc81914..439134decd70df5ca00964af6c4f7aa68116d84e 100644 (file)
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -5767,7 +5767,7 @@ zfs_ioctl_register_dataset_read(zfs_ioc_t ioc, zfs_ioc_legacy_func_t *func)
 
 static void
 zfs_ioctl_register_dataset_modify(zfs_ioc_t ioc, zfs_ioc_legacy_func_t *func,
-       zfs_secpolicy_func_t *secpolicy)
+    zfs_secpolicy_func_t *secpolicy)
 {
        zfs_ioctl_register_legacy(ioc, func, secpolicy,
            DATASET_NAME, B_TRUE, POOL_CHECK_SUSPENDED | POOL_CHECK_READONLY);

diff --git a/module/zfs/zfs_log.c b/module/zfs/zfs_log.c
index 8bb8b0a977a3dd7eb09348d0f004f187f497c163..ca369905246a83c4bc96d746abd2de7c4544612e 100644 (file)
--- a/module/zfs/zfs_log.c
+++ b/module/zfs/zfs_log.c
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015 by Delphix. All rights reserved.
  */
 
 
@@ -374,7 +375,7 @@ zfs_log_create(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
  */
 void
 zfs_log_remove(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
-       znode_t *dzp, char *name, uint64_t foid)
+    znode_t *dzp, char *name, uint64_t foid)
 {
        itx_t *itx;
        lr_remove_t *lr;
@@ -398,7 +399,7 @@ zfs_log_remove(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
  */
 void
 zfs_log_link(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
-       znode_t *dzp, znode_t *zp, char *name)
+    znode_t *dzp, znode_t *zp, char *name)
 {
        itx_t *itx;
        lr_link_t *lr;
@@ -453,7 +454,7 @@ zfs_log_symlink(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
  */
 void
 zfs_log_rename(zilog_t *zilog, dmu_tx_t *tx, uint64_t txtype,
-       znode_t *sdzp, char *sname, znode_t *tdzp, char *dname, znode_t *szp)
+    znode_t *sdzp, char *sname, znode_t *tdzp, char *dname, znode_t *szp)
 {
        itx_t *itx;
        lr_rename_t *lr;
@@ -483,8 +484,8 @@ long zfs_immediate_write_sz = 32768;
 
 void
 zfs_log_write(zilog_t *zilog, dmu_tx_t *tx, int txtype,
-       znode_t *zp, offset_t off, ssize_t resid, int ioflag,
-       zil_callback_t callback, void *callback_data)
+    znode_t *zp, offset_t off, ssize_t resid, int ioflag,
+    zil_callback_t callback, void *callback_data)
 {
        itx_wr_state_t write_state;
        boolean_t slogging;
@@ -567,7 +568,7 @@ zfs_log_write(zilog_t *zilog, dmu_tx_t *tx, int txtype,
  */
 void
 zfs_log_truncate(zilog_t *zilog, dmu_tx_t *tx, int txtype,
-       znode_t *zp, uint64_t off, uint64_t len)
+    znode_t *zp, uint64_t off, uint64_t len)
 {
        itx_t *itx;
        lr_truncate_t *lr;

diff --git a/module/zfs/zfs_replay.c b/module/zfs/zfs_replay.c
index 19387ce0500ec9c4b5cc7320cb53ff1e51b52e68..1e72745f0544dd8e4e408490f3d1a702e2857106 100644 (file)
--- a/module/zfs/zfs_replay.c
+++ b/module/zfs/zfs_replay.c
@@ -21,7 +21,7 @@
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 Cyril Plisko. All rights reserved.
- * Copyright (c) 2013 by Delphix. All rights reserved.
+ * Copyright (c) 2013, 2015 by Delphix. All rights reserved.
  */
 
 #include <sys/types.h>
@@ -58,7 +58,7 @@
 
 static void
 zfs_init_vattr(vattr_t *vap, uint64_t mask, uint64_t mode,
-       uint64_t uid, uint64_t gid, uint64_t rdev, uint64_t nodeid)
+    uint64_t uid, uint64_t gid, uint64_t rdev, uint64_t nodeid)
 {
        bzero(vap, sizeof (*vap));
        vap->va_mask = (uint_t)mask;

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index a242c6bf62f33ba87a926edf3a7d80a096dee5b6..6f906b90916556f5b84313fd1a371f492079c73f 100644 (file)
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -317,7 +317,7 @@ zio_data_buf_free(void *buf, size_t size)
  */
 void
 zio_push_transform(zio_t *zio, abd_t *data, uint64_t size, uint64_t bufsize,
-       zio_transform_func_t *transform)
+    zio_transform_func_t *transform)
 {
        zio_transform_t *zt = kmem_alloc(sizeof (zio_transform_t), KM_SLEEP);
 
@@ -1108,8 +1108,8 @@ zio_vdev_child_io(zio_t *pio, blkptr_t *bp, vdev_t *vd, uint64_t offset,
 
 zio_t *
 zio_vdev_delegated_io(vdev_t *vd, uint64_t offset, abd_t *data, uint64_t size,
-       int type, zio_priority_t priority, enum zio_flag flags,
-       zio_done_func_t *done, void *private)
+    int type, zio_priority_t priority, enum zio_flag flags,
+    zio_done_func_t *done, void *private)
 {
        zio_t *zio;
 

diff --git a/module/zfs/zrlock.c b/module/zfs/zrlock.c
index 52f9ee83930e8dc847d2a0191888bc3e47ac8fab..137875fe0694727116408cdfc03e0d8d4b045136 100644 (file)
--- a/module/zfs/zrlock.c
+++ b/module/zfs/zrlock.c
@@ -70,11 +70,7 @@ zrl_destroy(zrlock_t *zrl)
 }
 
 void
-#ifdef ZFS_DEBUG
-zrl_add_debug(zrlock_t *zrl, const char *zc)
-#else
-zrl_add(zrlock_t *zrl)
-#endif
+zrl_add_impl(zrlock_t *zrl, const char *zc)
 {
        uint32_t n = (uint32_t)zrl->zr_refcount;
 
@@ -199,11 +195,7 @@ zrl_owner(zrlock_t *zrl)
 
 #if defined(_KERNEL) && defined(HAVE_SPL)
 
-#ifdef ZFS_DEBUG
-EXPORT_SYMBOL(zrl_add_debug);
-#else
-EXPORT_SYMBOL(zrl_add);
-#endif
+EXPORT_SYMBOL(zrl_add_impl);
 EXPORT_SYMBOL(zrl_remove);
 
 #endif