diff options
| author | George Melikov <[email protected]> | 2017-01-12 20:42:11 +0300 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-01-12 09:42:11 -0800 |
| commit | e9aa730c49b91694b146e0cd28192f1aaf843d0e (patch) | |
| tree | 3ee2eaf10960ad98e5f5feaee05074db0f2876d5 /include/sys/zrlock.h | |
| parent | 42b64e50c093a4ad499458a6258254e399a4de52 (diff) | |
OpenZFS 6328 - Fix cstyle errors in zfs codebase
Authored by: Paul Dagnelie <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: Alex Reece <[email protected]>
Reviewed by: Richard Elling <[email protected]>
Reviewed by: Jorgen Lundman <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: George Melikov <[email protected]>
OpenZFS-issue: https://www.illumos.org/issues/6328
OpenZFS-commit: https://github.com/illumos/illumos-gate/commit/9a686fb
Closes #5579
Diffstat (limited to 'include/sys/zrlock.h')
| -rw-r--r-- | include/sys/zrlock.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/sys/zrlock.h b/include/sys/zrlock.h index dcd63f7b5..b6eba1a18 100644 --- 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 *); |