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