ctdb-ipalloc: Drop CTDB context argument from set_ipflags_internal()

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index d99f9aa08e0a4ab57c2d34ec3d2297eddb6cd1a6..055aac3ee3ef0dab8b7c641652473a226e6c58cd 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -2361,8 +2361,7 @@ static uint32_t *get_tunable_from_nodes(struct ctdb_context *ctdb,
  *     Set NOIPHOST ip flags for disabled nodes
  */
 static struct ctdb_ipflags *
-set_ipflags_internal(struct ctdb_context *ctdb,
-                    TALLOC_CTX *tmp_ctx,
+set_ipflags_internal(TALLOC_CTX *tmp_ctx,
                     struct ctdb_node_map_old *nodemap,
                     uint32_t *tval_noiptakeover,
                     uint32_t *tval_noiphostonalldisabled)
@@ -2372,7 +2371,10 @@ set_ipflags_internal(struct ctdb_context *ctdb,
 
        /* Clear IP flags - implicit due to talloc_zero */
        ipflags = talloc_zero_array(tmp_ctx, struct ctdb_ipflags, nodemap->num);
-       CTDB_NO_MEMORY_NULL(ctdb, ipflags);
+       if (ipflags == NULL) {
+               DEBUG(DEBUG_ERR, (__location__ " out of memory\n"));
+               return NULL;
+       }
 
        for (i=0;i<nodemap->num;i++) {
                /* Can not take IPs on node with NoIPTakeover set */
@@ -2432,7 +2434,7 @@ static struct ctdb_ipflags *set_ipflags(struct ctdb_context *ctdb,
                return NULL;
        }
 
-       ipflags = set_ipflags_internal(ctdb, tmp_ctx, nodemap,
+       ipflags = set_ipflags_internal(tmp_ctx, nodemap,
                                       tval_noiptakeover,
                                       tval_noiphostonalldisabled);
 

diff --git a/ctdb/tests/src/ctdb_takeover_tests.c b/ctdb/tests/src/ctdb_takeover_tests.c
index 0fe754c50a3e71a2b8a1b30a2f801ac60b8dbbe1..1dace90a501118ae1a832eb60d0180f1b264fa43 100644 (file)
--- a/ctdb/tests/src/ctdb_takeover_tests.c
+++ b/ctdb/tests/src/ctdb_takeover_tests.c
@@ -517,7 +517,7 @@ static void ctdb_test_init(const char nodestates[],
                (*ipalloc_state)->known_public_ips[i] = known[i];
        }
 
-       *ipflags = set_ipflags_internal(*ctdb, *ctdb, nodemap,
+       *ipflags = set_ipflags_internal(*ctdb, nodemap,
                                        tval_noiptakeover,
                                        tval_noiptakeoverondisabled);
 }