From 94fb2cf0ec20e3beaaf393e9c06bfd716775b922 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 16 Feb 2016 16:46:18 +1100 Subject: [PATCH] ctdb_recovery: ctdb_cluster_mutex() now takes an argstring argument All of the ctdb_cluster_mutex_* infrastucture can now handle an arbitrary mutex. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/server/ctdb_recover.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index b2037addc07..d90174e3760 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -969,7 +969,9 @@ static bool cluster_mutex_helper_args(TALLOC_CTX *mem_ctx, } static struct ctdb_cluster_mutex_handle * -ctdb_cluster_mutex(struct ctdb_context *ctdb, int timeout) +ctdb_cluster_mutex(struct ctdb_context *ctdb, + const char *argstring, + int timeout) { struct ctdb_cluster_mutex_handle *h; char **args; @@ -994,7 +996,7 @@ ctdb_cluster_mutex(struct ctdb_context *ctdb, int timeout) set_close_on_exec(h->fd[0]); /* Create arguments for lock helper */ - if (!cluster_mutex_helper_args(h, ctdb->recovery_lock_file, &args)) { + if (!cluster_mutex_helper_args(h, argstring, &args)) { close(h->fd[0]); close(h->fd[1]); talloc_free(h); @@ -1144,7 +1146,7 @@ int32_t ctdb_control_set_recmode(struct ctdb_context *ctdb, return 0; } - h = ctdb_cluster_mutex(ctdb, 5); + h = ctdb_cluster_mutex(ctdb, ctdb->recovery_lock_file, 5); if (h == NULL) { return -1; } @@ -1206,7 +1208,7 @@ bool ctdb_recovery_lock(struct ctdb_context *ctdb) .status = '0', }; - h = ctdb_cluster_mutex(ctdb, 0); + h = ctdb_cluster_mutex(ctdb, ctdb->recovery_lock_file, 0); if (h == NULL) { return -1; } -- 2.47.3