From: Volker Lendecke Date: Wed, 20 May 2015 15:59:53 +0000 (+0200) Subject: ctdbd_conn: ctdb_handle_message does not need msg_ctx X-Git-Tag: tevent-0.9.25~372 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9406d09fec2bab28d7cd27d774744ab908dc1e68;p=thirdparty%2Fsamba.git ctdbd_conn: ctdb_handle_message does not need msg_ctx Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 576cec1fbc0..d18aad86100 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -515,8 +515,7 @@ int ctdbd_conn_get_fd(struct ctdbd_connection *conn) /* * Packet handler to receive and handle a ctdb message */ -static NTSTATUS ctdb_handle_message(struct messaging_context *msg_ctx, - struct ctdbd_connection *conn, +static NTSTATUS ctdb_handle_message(struct ctdbd_connection *conn, struct ctdb_req_header *hdr) { struct ctdb_req_message *msg; @@ -549,8 +548,6 @@ static NTSTATUS ctdb_handle_message(struct messaging_context *msg_ctx, return NT_STATUS_OK; } - SMB_ASSERT(conn->msg_ctx != NULL); - ctdbd_msg_call_back(conn, msg); return NT_STATUS_OK; @@ -576,7 +573,7 @@ static void ctdbd_socket_handler(struct tevent_context *event_ctx, cluster_fatal("ctdbd died\n"); } - status = ctdb_handle_message(conn->msg_ctx, conn, hdr); + status = ctdb_handle_message(conn, hdr); if (!NT_STATUS_IS_OK(status)) { DEBUG(10, ("could not handle incoming message: %s\n", nt_errstr(status)));