sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-18 06:04:06 +03:00
Code

ctdb-daemon: Drop unused arguments

Browse Source 
Unused since commit a10545ab6bd8a1b9ca87b0fdba8381cb8af0e284.

Signed-off-by: Martin Schwenke <mschwenke@ddn.com>
Reviewed-by: Anoop C S <anoopcs@samba.org>
This commit is contained in:
Martin Schwenke 2024-06-18 15:54:26 +10:00 committed by Anoop C S
parent 46f6b50f7a
commit 7b4447b4d3
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/include/ctdb_private.h
View File

@ -893,7 +893,7 @@ int32_t ctdb_control_start_ipreallocate(struct ctdb_context *ctdb,
struct ctdb_req_control_old *c, struct ctdb_req_control_old *c,
bool *async_reply); bool *async_reply);
int ctdb_set_public_addresses(struct ctdb_context *ctdb, bool check_addresses); int ctdb_set_public_addresses(struct ctdb_context *ctdb);
int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id, int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
TDB_DATA indata); TDB_DATA indata);

2
ctdb/server/ctdb_daemon.c
View File

@ -1651,7 +1651,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb,
initialise_node_flags(ctdb); initialise_node_flags(ctdb);
ret = ctdb_set_public_addresses(ctdb, true); ret = ctdb_set_public_addresses(ctdb);
if (ret == -1) { if (ret == -1) {
D_ERR("Unable to setup public IP addresses\n"); D_ERR("Unable to setup public IP addresses\n");
exit(1); exit(1);

11
ctdb/server/ctdb_takeover.c
View File

@ -1051,8 +1051,7 @@ int32_t ctdb_control_release_ip(struct ctdb_context *ctdb,
static int ctdb_add_public_address(struct ctdb_context *ctdb, static int ctdb_add_public_address(struct ctdb_context *ctdb,
ctdb_sock_addr *addr, ctdb_sock_addr *addr,
unsigned mask, const char *ifaces, unsigned mask, const char *ifaces)
bool check_address)
{ {
struct ctdb_vnn *vnn; struct ctdb_vnn *vnn;
char *tmp; char *tmp;
@ -1124,7 +1123,7 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
/* /*
setup the public address lists from a file setup the public address lists from a file
*/ */
int ctdb_set_public_addresses(struct ctdb_context *ctdb, bool check_addresses) int ctdb_set_public_addresses(struct ctdb_context *ctdb)
{ {
bool ok; bool ok;
char **lines; char **lines;
@ -1208,7 +1207,7 @@ int ctdb_set_public_addresses(struct ctdb_context *ctdb, bool check_addresses)
return -1; return -1;
} }
if (ctdb_add_public_address(ctdb, &addr, mask, ifaces, check_addresses)) { if (ctdb_add_public_address(ctdb, &addr, mask, ifaces)) {
DEBUG(DEBUG_CRIT,("Failed to add line %u to the public address list\n", i+1)); DEBUG(DEBUG_CRIT,("Failed to add line %u to the public address list\n", i+1));
talloc_free(lines); talloc_free(lines);
return -1; return -1;
@ -2348,7 +2347,7 @@ int32_t ctdb_control_add_public_address(struct ctdb_context *ctdb, TDB_DATA inda
DEBUG(DEBUG_NOTICE,("Add IP %s\n", ctdb_addr_to_str(&pub->addr))); DEBUG(DEBUG_NOTICE,("Add IP %s\n", ctdb_addr_to_str(&pub->addr)));
ret = ctdb_add_public_address(ctdb, &pub->addr, pub->mask, &pub->iface[0], true); ret = ctdb_add_public_address(ctdb, &pub->addr, pub->mask, &pub->iface[0]);
if (ret != 0) { if (ret != 0) {
DEBUG(DEBUG_ERR,(__location__ " Failed to add public address\n")); DEBUG(DEBUG_ERR,(__location__ " Failed to add public address\n"));
@ -2618,7 +2617,7 @@ static int ctdb_reloadips_child(struct ctdb_context *ctdb)
/* Read IPs file - this is safe since this is a child process */ /* Read IPs file - this is safe since this is a child process */
ctdb->vnn = NULL; ctdb->vnn = NULL;
if (ctdb_set_public_addresses(ctdb, false) != 0) { if (ctdb_set_public_addresses(ctdb) != 0) {
DEBUG(DEBUG_ERR,("Failed to re-read public addresses file\n")); DEBUG(DEBUG_ERR,("Failed to re-read public addresses file\n"));
talloc_free(mem_ctx); talloc_free(mem_ctx);
return -1; return -1;