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 /lib/libspl | |
| 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 'lib/libspl')
| -rw-r--r-- | lib/libspl/asm-generic/atomic.c | 3 | ||||
| -rw-r--r-- | lib/libspl/getmntany.c | 4 | ||||
| -rw-r--r-- | lib/libspl/include/synch.h | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lib/libspl/asm-generic/atomic.c b/lib/libspl/asm-generic/atomic.c index f5eb4f34b..d0023b182 100644 --- a/lib/libspl/asm-generic/atomic.c +++ b/lib/libspl/asm-generic/atomic.c @@ -39,7 +39,7 @@ pthread_mutex_t atomic_lock = PTHREAD_MUTEX_INITIALIZER; /* * Theses are the void returning variants */ - +/* BEGIN CSTYLED */ #define ATOMIC_INC(name, type) \ void atomic_inc_##name(volatile type *target) \ { \ @@ -381,6 +381,7 @@ ATOMIC_SWAP(32, uint32_t) ATOMIC_SWAP(uint, uint_t) ATOMIC_SWAP(ulong, ulong_t) ATOMIC_SWAP(64, uint64_t) +/* END CSTYLED */ void * atomic_swap_ptr(volatile void *target, void *bits) diff --git a/lib/libspl/getmntany.c b/lib/libspl/getmntany.c index d78357af5..9e071c7ce 100644 --- a/lib/libspl/getmntany.c +++ b/lib/libspl/getmntany.c @@ -53,7 +53,7 @@ getmntany(FILE *fp, struct mnttab *mgetp, struct mnttab *mrefp) while ( ((ret = _sol_getmntent(fp, mgetp)) == 0) && ( DIFF(mnt_special) || DIFF(mnt_mountp) || - DIFF(mnt_fstype) || DIFF(mnt_mntopts))); + DIFF(mnt_fstype) || DIFF(mnt_mntopts))) { } return (ret); } @@ -86,7 +86,7 @@ getextmntent(FILE *fp, struct extmnttab *mp, int len) int ret; struct stat64 st; - ret = _sol_getmntent(fp, (struct mnttab *) mp); + ret = _sol_getmntent(fp, (struct mnttab *)mp); if (ret == 0) { if (stat64(mp->mnt_mountp, &st) != 0) { mp->mnt_major = 0; diff --git a/lib/libspl/include/synch.h b/lib/libspl/include/synch.h index 93d231498..d75b8b15e 100644 --- a/lib/libspl/include/synch.h +++ b/lib/libspl/include/synch.h @@ -53,11 +53,11 @@ rwlock_init(rwlock_t *rwlp, int type, void *arg) switch (type) { case USYNC_THREAD: VERIFY0(pthread_rwlockattr_setpshared(&attr, - PTHREAD_PROCESS_PRIVATE)); + PTHREAD_PROCESS_PRIVATE)); break; case USYNC_PROCESS: VERIFY0(pthread_rwlockattr_setpshared(&attr, - PTHREAD_PROCESS_SHARED)); + PTHREAD_PROCESS_SHARED)); break; default: VERIFY0(1); |