From 655634790139b08a5093dc3851dee208d13f7294 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Sat, 8 Jun 2019 06:08:48 +1000 Subject: [PATCH] ctdb-daemon: Make old list_of_nodes() function static The next commit will change the type of this function, which is only used in this file. So, make it static to isolate the change. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/include/ctdb_client.h | 3 --- ctdb/server/ctdb_client.c | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h index a48e506d271..ef4950ab533 100644 --- a/ctdb/include/ctdb_client.h +++ b/ctdb/include/ctdb_client.h @@ -278,9 +278,6 @@ uint32_t *list_of_vnnmap_nodes(struct ctdb_context *ctdb, struct ctdb_vnn_map *vnn_map, TALLOC_CTX *mem_ctx, bool include_self); -uint32_t *list_of_nodes(struct ctdb_context *ctdb, - struct ctdb_node_map_old *node_map, - TALLOC_CTX *mem_ctx, uint32_t mask, int exclude_pnn); uint32_t *list_of_active_nodes(struct ctdb_context *ctdb, struct ctdb_node_map_old *node_map, TALLOC_CTX *mem_ctx, bool include_self); diff --git a/ctdb/server/ctdb_client.c b/ctdb/server/ctdb_client.c index f66ecbea7c1..c5ffa121c3d 100644 --- a/ctdb/server/ctdb_client.c +++ b/ctdb/server/ctdb_client.c @@ -1772,11 +1772,11 @@ uint32_t *list_of_vnnmap_nodes(struct ctdb_context *ctdb, /* Get list of nodes not including those with flags specified by mask. * If exclude_pnn is not -1 then exclude that pnn from the list. */ -uint32_t *list_of_nodes(struct ctdb_context *ctdb, - struct ctdb_node_map_old *node_map, - TALLOC_CTX *mem_ctx, - uint32_t mask, - int exclude_pnn) +static uint32_t *list_of_nodes(struct ctdb_context *ctdb, + struct ctdb_node_map_old *node_map, + TALLOC_CTX *mem_ctx, + uint32_t mask, + int exclude_pnn) { int i, j, num_nodes; uint32_t *nodes; -- 2.34.1