diff options
| author | Brian Behlendorf <[email protected]> | 2016-12-12 10:46:26 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2016-12-12 10:46:26 -0800 |
| commit | 02730c333c4fce8c0ead1f7f3404caca5cdb3936 (patch) | |
| tree | e3943bf33ee177c50004a08d1d4ea4188dbfc542 /module/zfs/zvol.c | |
| parent | d57f03e40ec3bbf109e75b83699b58157b9a867d (diff) | |
Use cstyle -cpP in `make cstyle` check
Enable picky cstyle checks and resolve the new warnings. The vast
majority of the changes needed were to handle minor issues with
whitespace formatting. This patch contains no functional changes.
Non-whitespace changes are as follows:
* 8 times ; to { } in for/while loop
* fix missing ; in cmd/zed/agents/zfs_diagnosis.c
* comment (confim -> confirm)
* change endline , to ; in cmd/zpool/zpool_main.c
* a number of /* BEGIN CSTYLED */ /* END CSTYLED */ blocks
* /* CSTYLED */ markers
* change == 0 to !
* ulong to unsigned long in module/zfs/dsl_scan.c
* rearrangement of module_param lines in module/zfs/metaslab.c
* add { } block around statement after for_each_online_node
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Håkan Johansson <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #5465
Diffstat (limited to 'module/zfs/zvol.c')
| -rw-r--r-- | module/zfs/zvol.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/module/zfs/zvol.c b/module/zfs/zvol.c index 61d0538a3..2c99b73c2 100644 --- a/module/zfs/zvol.c +++ b/module/zfs/zvol.c @@ -572,9 +572,9 @@ zvol_log_write(zvol_state_t *zv, dmu_tx_t *tx, uint64_t offset, return; immediate_write_sz = (zilog->zl_logbias == ZFS_LOGBIAS_THROUGHPUT) - ? 0 : zvol_immediate_write_sz; + ? 0 : zvol_immediate_write_sz; slogging = spa_has_slogs(zilog->zl_spa) && - (zilog->zl_logbias == ZFS_LOGBIAS_LATENCY); + (zilog->zl_logbias == ZFS_LOGBIAS_LATENCY); while (size) { itx_t *itx; @@ -1441,7 +1441,7 @@ zvol_create_minor_impl(const char *name) if (len > 0) { dmu_prefetch(os, ZVOL_OBJ, 0, 0, len, ZIO_PRIORITY_SYNC_READ); dmu_prefetch(os, ZVOL_OBJ, 0, volsize - len, len, - ZIO_PRIORITY_SYNC_READ); + ZIO_PRIORITY_SYNC_READ); } zv->zv_objset = NULL; @@ -1539,7 +1539,7 @@ zvol_create_snap_minor_cb(const char *dsname, void *arg) /* at this point, the dsname should name a snapshot */ if (strchr(dsname, '@') == 0) { dprintf("zvol_create_snap_minor_cb(): " - "%s is not a shapshot name\n", dsname); + "%s is not a shapshot name\n", dsname); } else { minors_job_t *job; char *n = strdup(dsname); @@ -1608,7 +1608,7 @@ zvol_create_minors_cb(const char *dsname, void *arg) } } else { dprintf("zvol_create_minors_cb(): %s is not a zvol name\n", - dsname); + dsname); } return (0); @@ -1954,7 +1954,7 @@ zvol_set_snapdev_sync_cb(dsl_pool_t *dp, dsl_dataset_t *ds, void *arg) return (0); (void) taskq_dispatch(dp->dp_spa->spa_zvol_taskq, zvol_task_cb, - task, TQ_SLEEP); + task, TQ_SLEEP); return (0); } @@ -2087,6 +2087,7 @@ zvol_fini(void) mutex_destroy(&zvol_state_lock); } +/* BEGIN CSTYLED */ module_param(zvol_inhibit_dev, uint, 0644); MODULE_PARM_DESC(zvol_inhibit_dev, "Do not create zvol device nodes"); @@ -2098,3 +2099,4 @@ MODULE_PARM_DESC(zvol_max_discard_blocks, "Max number of blocks to discard"); module_param(zvol_prefetch_bytes, uint, 0644); MODULE_PARM_DESC(zvol_prefetch_bytes, "Prefetch N bytes at zvol start+end"); +/* END CSTYLED */ |