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

change ctdb_validate_vnn to ctdb_validate_pnn

Browse Source 
(This used to be ctdb commit a4a1f41b69475b9dc16d8fd7f8965c32e96c32f0)
This commit is contained in:
Ronnie Sahlberg
2007-09-04 10:09:58 +10:00
parent eb4cf6a686
commit fc9d39c3a6
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/include/ctdb_private.h
View File

@ -107,9 +107,9 @@ struct ctdb_address {
}; };
/* /*
check a vnn is valid check that a pnn is valid
*/ */
#define ctdb_validate_vnn(ctdb, vnn) (((uint32_t)(vnn)) < (ctdb)->num_nodes) #define ctdb_validate_pnn(ctdb, pnn) (((uint32_t)(pnn)) < (ctdb)->num_nodes)
/* called from the queue code when a packet comes in. Called with data==NULL /* called from the queue code when a packet comes in. Called with data==NULL

2
ctdb/server/ctdb_control.c
View File

@ -469,7 +469,7 @@ int ctdb_daemon_send_control(struct ctdb_context *ctdb, uint32_t destnode,
if (destnode != CTDB_BROADCAST_VNNMAP && if (destnode != CTDB_BROADCAST_VNNMAP &&
destnode != CTDB_BROADCAST_ALL && destnode != CTDB_BROADCAST_ALL &&
destnode != CTDB_BROADCAST_CONNECTED && destnode != CTDB_BROADCAST_CONNECTED &&
(!ctdb_validate_vnn(ctdb, destnode) || (!ctdb_validate_pnn(ctdb, destnode) ||
(ctdb->nodes[destnode]->flags & NODE_FLAGS_DISCONNECTED))) { (ctdb->nodes[destnode]->flags & NODE_FLAGS_DISCONNECTED))) {
if (!(flags & CTDB_CTRL_FLAG_NOREPLY)) { if (!(flags & CTDB_CTRL_FLAG_NOREPLY)) {
callback(ctdb, -1, tdb_null, "ctdb_control to disconnected node", private_data); callback(ctdb, -1, tdb_null, "ctdb_control to disconnected node", private_data);

6
ctdb/server/ctdb_daemon.c
View File

@ -38,12 +38,12 @@ static void flag_change_handler(struct ctdb_context *ctdb, uint64_t srvid,
{ {
struct ctdb_node_flag_change *c = (struct ctdb_node_flag_change *)data.dptr; struct ctdb_node_flag_change *c = (struct ctdb_node_flag_change *)data.dptr;
if (data.dsize != sizeof(*c) || !ctdb_validate_vnn(ctdb, c->vnn)) { if (data.dsize != sizeof(*c) || !ctdb_validate_pnn(ctdb, c->vnn)) {
DEBUG(0,(__location__ "Invalid data in ctdb_node_flag_change\n")); DEBUG(0,(__location__ "Invalid data in ctdb_node_flag_change\n"));
return; return;
} }
if (!ctdb_validate_vnn(ctdb, c->vnn)) { if (!ctdb_validate_pnn(ctdb, c->vnn)) {
DEBUG(0,("Bad vnn %u in flag_change_handler\n", c->vnn)); DEBUG(0,("Bad vnn %u in flag_change_handler\n", c->vnn));
return; return;
} }
@ -809,7 +809,7 @@ static void daemon_request_control_from_client(struct ctdb_client *client,
state->client = client; state->client = client;
state->c = talloc_steal(state, c); state->c = talloc_steal(state, c);
state->reqid = c->hdr.reqid; state->reqid = c->hdr.reqid;
if (ctdb_validate_vnn(client->ctdb, c->hdr.destnode)) { if (ctdb_validate_pnn(client->ctdb, c->hdr.destnode)) {
state->node = client->ctdb->nodes[c->hdr.destnode]; state->node = client->ctdb->nodes[c->hdr.destnode];
DLIST_ADD(state->node->pending_controls, state); DLIST_ADD(state->node->pending_controls, state);
} else { } else {

8
ctdb/server/ctdb_recoverd.c
View File

@ -54,8 +54,8 @@ static void ctdb_unban_node(struct ctdb_recoverd *rec, uint32_t vnn)
{ {
struct ctdb_context *ctdb = rec->ctdb; struct ctdb_context *ctdb = rec->ctdb;
if (!ctdb_validate_vnn(ctdb, vnn)) { if (!ctdb_validate_pnn(ctdb, vnn)) {
DEBUG(0,("Bad vnn %u in ctdb_ban_node\n", vnn)); DEBUG(0,("Bad pnn %u in ctdb_ban_node\n", vnn));
return; return;
} }
@ -90,8 +90,8 @@ static void ctdb_ban_node(struct ctdb_recoverd *rec, uint32_t vnn, uint32_t ban_
{ {
struct ctdb_context *ctdb = rec->ctdb; struct ctdb_context *ctdb = rec->ctdb;
if (!ctdb_validate_vnn(ctdb, vnn)) { if (!ctdb_validate_pnn(ctdb, vnn)) {
DEBUG(0,("Bad vnn %u in ctdb_ban_node\n", vnn)); DEBUG(0,("Bad pnn %u in ctdb_ban_node\n", vnn));
return; return;
} }

2
ctdb/server/ctdb_server.c
View File

@ -455,7 +455,7 @@ void ctdb_queue_packet(struct ctdb_context *ctdb, struct ctdb_req_header *hdr)
ctdb->statistics.node_packets_sent++; ctdb->statistics.node_packets_sent++;
if (!ctdb_validate_vnn(ctdb, hdr->destnode)) { if (!ctdb_validate_pnn(ctdb, hdr->destnode)) {
DEBUG(0,(__location__ " cant send to node %u that does not exist\n", DEBUG(0,(__location__ " cant send to node %u that does not exist\n",
hdr->destnode)); hdr->destnode));
return; return;

2
ctdb/server/ctdbd.c
View File

@ -66,7 +66,7 @@ static void ctdb_recv_pkt(struct ctdb_context *ctdb, uint8_t *data, uint32_t len
ctdb->statistics.node_packets_recv++; ctdb->statistics.node_packets_recv++;
/* up the counter for this source node, so we know its alive */ /* up the counter for this source node, so we know its alive */
if (ctdb_validate_vnn(ctdb, hdr->srcnode)) { if (ctdb_validate_pnn(ctdb, hdr->srcnode)) {
/* as a special case, redirected calls don't increment the rx_cnt */ /* as a special case, redirected calls don't increment the rx_cnt */
if (hdr->operation != CTDB_REQ_CALL || if (hdr->operation != CTDB_REQ_CALL ||
((struct ctdb_req_call *)hdr)->hopcount == 0) { ((struct ctdb_req_call *)hdr)->hopcount == 0) {