sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

ctdbd_conn: Pass "ev" through ctdbd_socket_readable

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Volker Lendecke 2017-06-01 18:00:45 +02:00 committed by Ralph Boehme
parent 3ee2e53b04
commit dc390cf989
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/include/ctdbd_conn.h
View File

@ -42,7 +42,8 @@ int ctdbd_setup_fde(struct ctdbd_connection *conn, struct tevent_context *ev);
uint32_t ctdbd_vnn(const struct ctdbd_connection *conn);
int ctdbd_conn_get_fd(struct ctdbd_connection *conn);
void ctdbd_socket_readable(struct ctdbd_connection *conn);
void ctdbd_socket_readable(struct tevent_context *ev,
struct ctdbd_connection *conn);
int ctdbd_messaging_send_iov(struct ctdbd_connection *conn,
uint32_t dst_vnn, uint64_t dst_srvid,

5
source3/lib/ctdbd_conn.c
View File

@ -593,7 +593,8 @@ static int ctdb_handle_message(struct tevent_context *ev,
return 0;
}
void ctdbd_socket_readable(struct ctdbd_connection *conn)
void ctdbd_socket_readable(struct tevent_context *ev,
struct ctdbd_connection *conn)
{
struct ctdb_req_header *hdr = NULL;
int ret;
@ -604,7 +605,7 @@ void ctdbd_socket_readable(struct ctdbd_connection *conn)
cluster_fatal("ctdbd died\n");
}
ret = ctdb_handle_message(NULL, conn, hdr);
ret = ctdb_handle_message(ev, conn, hdr);
TALLOC_FREE(hdr);

2
source3/lib/messages_ctdbd.c
View File

@ -174,7 +174,7 @@ static void messaging_ctdbd_readable(struct tevent_context *ev,
if ((flags & TEVENT_FD_READ) == 0) {
return;
}
ctdbd_socket_readable(conn);
ctdbd_socket_readable(ev, conn);
}
static int messaging_ctdbd_init_internal(struct messaging_context *msg_ctx,