diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-01-24 10:21:37 +1100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2020-08-27 12:11:01 +0000 |
| commit | 58627af19cc9d57d4d36d26406884c7e35036929 (patch) | |
| tree | ce785df52a85fa89fea8bbeacf2be7956343ec61 | |
| parent | 98580fca5f681e19d7310006f6e85607a3f7871c (diff) | |
| download | samba-58627af19cc9d57d4d36d26406884c7e35036929.tar.gz | |
ctdb-recoverd: Rename update_local_flags() -> update_flags()
This also updates remote flags so the name is misleading.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14466
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 4aa8e72d60e92951b35190d2ffcfdb1bfb756609)
Autobuild-User(v4-13-test): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(v4-13-test): Thu Aug 27 12:11:01 UTC 2020 on sn-devel-184
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 3c355e10565..f825427e7a3 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -541,9 +541,9 @@ static void ctdb_wait_election(struct ctdb_recoverd *rec) * flags changes to all nodes. This is only run by the recovery * master. */ -static int update_local_flags(struct ctdb_recoverd *rec, - struct ctdb_node_map_old *nodemap, - struct ctdb_node_map_old **remote_nodemaps) +static int update_flags(struct ctdb_recoverd *rec, + struct ctdb_node_map_old *nodemap, + struct ctdb_node_map_old **remote_nodemaps) { unsigned int j; struct ctdb_context *ctdb = rec->ctdb; @@ -2554,10 +2554,10 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, return; } - /* ensure our local copies of flags are right */ - ret = update_local_flags(rec, nodemap, remote_nodemaps); + /* Ensure our local and remote flags are correct */ + ret = update_flags(rec, nodemap, remote_nodemaps); if (ret != 0) { - DEBUG(DEBUG_ERR,("Unable to update local flags\n")); + D_ERR("Unable to update flags\n"); return; } |