sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

ctdb:daemon avoid goto ctdb_remove_orphaned_ifaces()

Browse Source 
Signed-off-by: Gregor Beck <gbeck@sernet.de>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue Apr  1 02:59:05 CEST 2014 on sn-devel-104
This commit is contained in:
Gregor Beck 2014-03-31 08:04:21 +02:00 committed by Michael Adam
parent dd56afc7df
commit 6cdde2711b
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ctdb/server/ctdb_takeover.c
View File

@ -120,18 +120,17 @@ static bool vnn_has_interface_with_name(struct ctdb_vnn *vnn,
static void ctdb_remove_orphaned_ifaces(struct ctdb_context *ctdb,
struct ctdb_vnn *vnn)
{
struct ctdb_iface *i;
struct ctdb_iface *i, *next;
/* For each interface, check if there's an IP using it. */
i = ctdb->ifaces;
while (i != NULL) {
for (i = ctdb->ifaces; i != NULL; i = next) {
struct ctdb_vnn *tv;
bool found;
struct ctdb_iface *next = i->next;
next = i->next;
/* Only consider interfaces named in the given VNN. */
if (!vnn_has_interface_with_name(vnn, i->name)) {
goto next;
continue;
}
/* Is the "single IP" on this interface? */
@ -139,7 +138,7 @@ static void ctdb_remove_orphaned_ifaces(struct ctdb_context *ctdb,
(ctdb->single_ip_vnn->ifaces[0] != NULL) &&
(strcmp(i->name, ctdb->single_ip_vnn->ifaces[0]) == 0)) {
/* Found, next interface please... */
goto next;
continue;
}
/* Search for a vnn with this interface. */
found = false;
@ -155,9 +154,6 @@ static void ctdb_remove_orphaned_ifaces(struct ctdb_context *ctdb,
DLIST_REMOVE(ctdb->ifaces, i);
talloc_free(i);
}
next:
i = next;
}
}