ctdb-ipalloc: node_ip_coverage() doesn't need CTDB context
authorMartin Schwenke <martin@meltin.net>
Wed, 28 Oct 2015 11:59:18 +0000 (22:59 +1100)
committerAmitay Isaacs <amitay@samba.org>
Fri, 20 Nov 2015 00:36:31 +0000 (01:36 +0100)
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_takeover.c

index c9179d3017399767804c4f61ce7c14f16327eb3a..c84e3cacee0b884b4e35bc900e313112080cdcd1 100644 (file)
@@ -1242,8 +1242,7 @@ struct public_ip_list {
 /* Given a physical node, return the number of
    public addresses that is currently assigned to this node.
 */
-static int node_ip_coverage(struct ctdb_context *ctdb, int32_t pnn,
-                           struct public_ip_list *ips)
+static int node_ip_coverage(int32_t pnn, struct public_ip_list *ips)
 {
        int num=0;
 
@@ -1318,7 +1317,7 @@ static int find_takeover_node(struct ctdb_context *ctdb,
                        continue;
                }
 
-               num = node_ip_coverage(ctdb, i, all_ips);
+               num = node_ip_coverage(i, all_ips);
                /* was this the first node we checked ? */
                if (pnn == -1) {
                        pnn = i;
@@ -1673,7 +1672,7 @@ try_again:
                                continue;
                        }
 
-                       num = node_ip_coverage(ctdb, i, all_ips);
+                       num = node_ip_coverage(i, all_ips);
                        if (maxnode == -1) {
                                maxnode = i;
                                maxnum  = num;