]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdbd_conn: ctdb_handle_message does not need msg_ctx
authorVolker Lendecke <vl@samba.org>
Wed, 20 May 2015 15:59:53 +0000 (17:59 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 28 May 2015 09:13:09 +0000 (11:13 +0200)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/lib/ctdbd_conn.c

index 576cec1fbc01411fba977abd737f27b94a78db6b..d18aad86100b2bf1108dabd6ec0f20b3c1e26338 100644 (file)
@@ -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)));