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 <behlendorf1@llnl.gov>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Olaf Faaland <faaland1@llnl.gov>
Closes #6357
Closes #6360

diff --git a/module/zfs/mmp.c b/module/zfs/mmp.c
index 6541eca162bdcc12a36871974eae57e09f3c1b82..ae5478a3313102c0de6258450dba3bdc168a5d77 100644 (file)
--- 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);
        }