sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-ipalloc: Switch noiphost to struct bitmap

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2017-02-03 12:28:44 +11:00 committed by Martin Schwenke
parent 0b4e609194
commit 5bb6ec6af2
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ctdb/server/ipalloc.c
View File

@ -52,10 +52,8 @@ ipalloc_state_init(TALLOC_CTX *mem_ctx,
ipalloc_state->num = num_nodes;
ipalloc_state->noiphost =
talloc_zero_array(ipalloc_state,
bool,
ipalloc_state->num);
ipalloc_state->noiphost = bitmap_talloc(ipalloc_state,
ipalloc_state->num);
if (ipalloc_state->noiphost == NULL) {
DEBUG(DEBUG_ERR, (__location__ " Out of memory\n"));
goto fail;
@ -220,7 +218,7 @@ void ipalloc_set_node_flags(struct ipalloc_state *ipalloc_state,
for (i=0;i<nodemap->num;i++) {
/* Can not host IPs on INACTIVE node */
if (nodemap->node[i].flags & NODE_FLAGS_INACTIVE) {
ipalloc_state->noiphost[i] = true;
bitmap_set(ipalloc_state->noiphost, i);
}
/* If node is disabled then it can only host IPs if
@ -231,7 +229,7 @@ void ipalloc_set_node_flags(struct ipalloc_state *ipalloc_state,
if (!(all_disabled &&
ipalloc_state->no_ip_host_on_all_disabled == 0)) {
ipalloc_state->noiphost[i] = true;
bitmap_set(ipalloc_state->noiphost, i);
}
}
}

2
ctdb/server/ipalloc_common.c
View File

@ -61,7 +61,7 @@ static bool can_node_host_ip(struct ipalloc_state *ipalloc_state,
int32_t pnn,
struct public_ip_list *ip)
{
if (ipalloc_state->noiphost[pnn]) {
if (bitmap_query(ipalloc_state->noiphost, pnn)) {
return false;
}

2
ctdb/server/ipalloc_private.h
View File

@ -32,7 +32,7 @@ struct ipalloc_state {
/* Arrays with data for each node */
struct ctdb_public_ip_list *available_public_ips;
struct ctdb_public_ip_list *known_public_ips;
bool *noiphost;
struct bitmap *noiphost;
struct public_ip_list *all_ips;
enum ipalloc_algorithm algorithm;