diff options
| author | Olaf Faaland <[email protected]> | 2017-07-24 11:22:10 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-07-24 11:22:10 -0700 |
| commit | b6e5c40382a52206f48cb26cc20ed85294e1b0a9 (patch) | |
| tree | dd6385e52f9d3d524cb19bb5547482be1c70160d /module/zfs/mmp.c | |
| parent | 802ae562ed817af978e2636806db1952d29ee86d (diff) | |
Use correct macro for hz in mmp.c
Commit 379ca9c Multi-modifier protection (MMP) used HZ to convert
nanoseconds to ticks for use with cv_timedwait() and ddi_get_lbolt().
The correct macro is hz, which is defined within the SPL for kernel
space, and within zfs_context.h for user space.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Signed-off-by: Olaf Faaland <[email protected]>
Closes #6357
Closes #6360
Diffstat (limited to 'module/zfs/mmp.c')
| -rw-r--r-- | module/zfs/mmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/module/zfs/mmp.c b/module/zfs/mmp.c index 6541eca16..ae5478a33 100644 --- a/module/zfs/mmp.c +++ b/module/zfs/mmp.c @@ -446,7 +446,7 @@ mmp_thread(spa_t *spa) CALLB_CPR_SAFE_BEGIN(&cpr); (void) cv_timedwait_sig(&mmp->mmp_thread_cv, &mmp->mmp_thread_lock, ddi_get_lbolt() + - ((next_time - gethrtime()) / (NANOSEC / HZ))); + ((next_time - gethrtime()) / (NANOSEC / hz))); CALLB_CPR_SAFE_END(&cpr, &mmp->mmp_thread_lock); } |