63 lines
2.5 KiB
Diff
63 lines
2.5 KiB
Diff
From 200b0896455e243f2840b9849eb3a9230315c85f Mon Sep 17 00:00:00 2001
|
|
From: Ken Gaillot <kgaillot@redhat.com>
|
|
Date: Tue, 14 Jan 2025 14:11:58 -0600
|
|
Subject: [PATCH 15/16] Refactor: controller: drop unused argument
|
|
|
|
---
|
|
daemons/controld/controld_fencing.c | 11 +++++------
|
|
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/daemons/controld/controld_fencing.c b/daemons/controld/controld_fencing.c
|
|
index 7565b6c6c4..e5f03ef51c 100644
|
|
--- a/daemons/controld/controld_fencing.c
|
|
+++ b/daemons/controld/controld_fencing.c
|
|
@@ -208,8 +208,7 @@ cib_fencing_updated(xmlNode *msg, int call_id, int rc, xmlNode *output,
|
|
}
|
|
|
|
static void
|
|
-send_stonith_update(pcmk__graph_action_t *action, const char *target,
|
|
- const char *uuid)
|
|
+send_stonith_update(const char *target, const char *uuid)
|
|
{
|
|
int rc = pcmk_ok;
|
|
pcmk__node_status_t *peer = NULL;
|
|
@@ -387,7 +386,7 @@ execute_stonith_cleanup(void)
|
|
const char *uuid = pcmk__cluster_get_xml_id(target_node);
|
|
|
|
crm_notice("Marking %s, target of a previous stonith action, as clean", target);
|
|
- send_stonith_update(NULL, target, uuid);
|
|
+ send_stonith_update(target, uuid);
|
|
free(target);
|
|
}
|
|
g_list_free(stonith_cleanup_list);
|
|
@@ -602,7 +601,7 @@ handle_fence_notification(stonith_t *st, stonith_event_t *event)
|
|
|
|
if (AM_I_DC) {
|
|
/* The DC always sends updates */
|
|
- send_stonith_update(NULL, event->target, uuid);
|
|
+ send_stonith_update(event->target, uuid);
|
|
|
|
/* @TODO Ideally, at this point, we'd check whether the fenced node
|
|
* hosted any guest nodes, and call remote_node_down() for them.
|
|
@@ -639,7 +638,7 @@ handle_fence_notification(stonith_t *st, stonith_event_t *event)
|
|
* have them do so too after the election
|
|
*/
|
|
if (controld_is_local_node(event->executioner)) {
|
|
- send_stonith_update(NULL, event->target, uuid);
|
|
+ send_stonith_update(event->target, uuid);
|
|
}
|
|
add_stonith_cleanup(event->target);
|
|
}
|
|
@@ -887,7 +886,7 @@ tengine_stonith_callback(stonith_t *stonith, stonith_callback_data_t *data)
|
|
is_remote_node);
|
|
|
|
} else if (!(pcmk_is_set(action->flags, pcmk__graph_action_sent_update))) {
|
|
- send_stonith_update(action, target, uuid);
|
|
+ send_stonith_update(target, uuid);
|
|
pcmk__set_graph_action_flags(action,
|
|
pcmk__graph_action_sent_update);
|
|
}
|
|
--
|
|
2.43.0
|
|
|