aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs/mmp.c
diff options
context:
space:
mode:
authorRich Ercolani <[email protected]>2021-06-23 00:53:45 -0400
committerBrian Behlendorf <[email protected]>2021-06-24 13:12:36 -0700
commit5e89181544a53e307c9f7850ee5eef21d39e6394 (patch)
treeca3bfcf2560883d6cf442a66c3bf108732297b4a /module/zfs/mmp.c
parentdfbda2465f3418eccf92a560e291b6ab77410243 (diff)
Annotated dprintf as printf-like
ZFS loves using %llu for uint64_t, but that requires a cast to not be noisy - which is even done in many, though not all, places. Also a couple places used %u for uint64_t, which were promoted to %llu. Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rich Ercolani <[email protected]> Closes #12233
Diffstat (limited to 'module/zfs/mmp.c')
-rw-r--r--module/zfs/mmp.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/module/zfs/mmp.c b/module/zfs/mmp.c
index d05c9db24..d9ed457a7 100644
--- a/module/zfs/mmp.c
+++ b/module/zfs/mmp.c
@@ -485,8 +485,9 @@ mmp_write_uberblock(spa_t *spa)
if (mmp->mmp_skip_error != 0) {
mmp->mmp_skip_error = 0;
zfs_dbgmsg("MMP write after skipping due to unavailable "
- "leaves, pool '%s' gethrtime %llu leaf %#llu",
- spa_name(spa), gethrtime(), vd->vdev_guid);
+ "leaves, pool '%s' gethrtime %llu leaf %llu",
+ spa_name(spa), (u_longlong_t)gethrtime(),
+ (u_longlong_t)vd->vdev_guid);
}
if (mmp->mmp_zio_root == NULL)
@@ -617,10 +618,11 @@ mmp_thread(void *arg)
"mmp_interval %llu last_mmp_fail_intervals %u "
"mmp_fail_intervals %u mmp_fail_ns %llu "
"skip_wait %d leaves %d next_time %llu",
- spa_name(spa), gethrtime(), last_mmp_interval,
- mmp_interval, last_mmp_fail_intervals,
- mmp_fail_intervals, mmp_fail_ns, skip_wait, leaves,
- next_time);
+ spa_name(spa), (u_longlong_t)gethrtime(),
+ (u_longlong_t)last_mmp_interval,
+ (u_longlong_t)mmp_interval, last_mmp_fail_intervals,
+ mmp_fail_intervals, (u_longlong_t)mmp_fail_ns,
+ skip_wait, leaves, (u_longlong_t)next_time);
}
/*
@@ -633,8 +635,9 @@ mmp_thread(void *arg)
zfs_dbgmsg("MMP state change pool '%s': gethrtime %llu "
"last_spa_multihost %u multihost %u "
"last_spa_suspended %u suspended %u",
- spa_name(spa), last_spa_multihost, multihost,
- last_spa_suspended, suspended);
+ spa_name(spa), (u_longlong_t)gethrtime(),
+ last_spa_multihost, multihost, last_spa_suspended,
+ suspended);
mutex_enter(&mmp->mmp_io_lock);
mmp->mmp_last_write = gethrtime();
mmp->mmp_delay = mmp_interval;