From 4f6e9461edb571577eebb712e676eec4c7edd5ec Mon Sep 17 00:00:00 2001 From: David Teigland Date: Tue, 8 Feb 2022 09:54:06 -0600 Subject: [PATCH 1/5] dlm_controld: fix printf args in log messages Fix log message arg types in two recent commits: dcc945a9d40b90a7b13d7f826f2726f35921f95b "dlm_controld: use uint64_t for cluster ringid" b0222892f0b82ff680d4b3f9ac4250f47300d897 "dlm_controld: add support for per nodeid configuration" --- dlm_controld/cpg.c | 2 +- dlm_controld/node_config.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlm_controld/cpg.c b/dlm_controld/cpg.c index f3365ee4cd77..b9f9a16b8ae0 100644 --- a/dlm_controld/cpg.c +++ b/dlm_controld/cpg.c @@ -450,7 +450,7 @@ static int check_ringid_done(struct lockspace *ls) but that's probably not guaranteed.) */ if (ls->cpg_ringid_wait) { - log_group(ls, "check_ringid wait cluster %u cpg %llu:%llu", + log_group(ls, "check_ringid wait cluster %llu cpg %u:%llu", (unsigned long long)cluster_ringid_seq, ls->cpg_ringid.nodeid, (unsigned long long)ls->cpg_ringid.seq); diff --git a/dlm_controld/node_config.c b/dlm_controld/node_config.c index fe794be72f22..9845e8988e8c 100644 --- a/dlm_controld/node_config.c +++ b/dlm_controld/node_config.c @@ -58,8 +58,8 @@ int node_config_init(const char *path) } nc[nodeid].mark = mark; - log_debug("parsed node config id=%d mark=%" PRIu32, - nodeid, mark); + log_debug("parsed node config id=%d mark=%llu", + nodeid, (unsigned long long)mark); } } -- 2.7.5