rename tnode->queue to tnode->out_queue to indicate this queue is for

sending data out to the other node

(This used to be ctdb commit 0bc949c529094570da56c9007ff96b1f5ad02c59)

4 files changed, 5 insertions, 5 deletions

diff --git a/ctdb/tcp/ctdb_tcp.h b/ctdb/tcp/ctdb_tcp.h
index c8df8bb63f..9489028be0 100644
--- a/ctdb/tcp/ctdb_tcp.h
+++ b/ctdb/tcp/ctdb_tcp.h
@@ -38,7 +38,7 @@ struct ctdb_incoming {
 */
 struct ctdb_tcp_node {
 	int fd;
-	struct ctdb_queue *queue;
+	struct ctdb_queue *out_queue;
 	struct fd_event *connect_fde;
 	struct timed_event *connect_te;
 };
diff --git a/ctdb/tcp/tcp_connect.c b/ctdb/tcp/tcp_connect.c
index 991623a512..77aa242c9f 100644
--- a/ctdb/tcp/tcp_connect.c
+++ b/ctdb/tcp/tcp_connect.c
@@ -41,7 +41,7 @@ void ctdb_tcp_tnode_cb(uint8_t *data, size_t cnt, void *private_data)
 
 	/* start a new connect cycle to try to re-establish the
 	   link */
-	ctdb_queue_set_fd(tnode->queue, -1);
+	ctdb_queue_set_fd(tnode->out_queue, -1);
 	tnode->fd = -1;
 	event_add_timed(node->ctdb->ev, tnode, timeval_zero(), 
 			ctdb_tcp_node_connect, node);
@@ -80,7 +80,7 @@ static void ctdb_node_connect_write(struct event_context *ev, struct fd_event *f
         setsockopt(tnode->fd,IPPROTO_TCP,TCP_NODELAY,(char *)&one,sizeof(one));
         setsockopt(tnode->fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&one,sizeof(one));
 
-	ctdb_queue_set_fd(tnode->queue, tnode->fd);
+	ctdb_queue_set_fd(tnode->out_queue, tnode->fd);
 
 	/* tell the ctdb layer we are connected */
 	node->ctdb->upcalls->node_connected(node);
diff --git a/ctdb/tcp/tcp_init.c b/ctdb/tcp/tcp_init.c
index ab1de71ca4..603812632d 100644
--- a/ctdb/tcp/tcp_init.c
+++ b/ctdb/tcp/tcp_init.c
@@ -41,7 +41,7 @@ static int ctdb_tcp_add_node(struct ctdb_node *node)
 	tnode->fd = -1;
 	node->private_data = tnode;
 
-	tnode->queue = ctdb_queue_setup(node->ctdb, ctcp, tnode->fd, CTDB_TCP_ALIGNMENT,
+	tnode->out_queue = ctdb_queue_setup(node->ctdb, ctcp, tnode->fd, CTDB_TCP_ALIGNMENT,
 					ctdb_tcp_tnode_cb, node);
 	
 	return 0;
diff --git a/ctdb/tcp/tcp_io.c b/ctdb/tcp/tcp_io.c
index dff5ca670e..7d26eca256 100644
--- a/ctdb/tcp/tcp_io.c
+++ b/ctdb/tcp/tcp_io.c
@@ -86,5 +86,5 @@ int ctdb_tcp_queue_pkt(struct ctdb_node *node, uint8_t *data, uint32_t length)
 {
 	struct ctdb_tcp_node *tnode = talloc_get_type(node->private_data,
 						      struct ctdb_tcp_node);
-	return ctdb_queue_send(tnode->queue, data, length);
+	return ctdb_queue_send(tnode->out_queue, data, length);
 }