Convert np_write to tevent_req

1 files changed, 13 insertions, 12 deletions

diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index d18b5debe0..4383897c57 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -211,14 +211,14 @@ struct dcerpc_cmd_state {
 	size_t max_read;
 };
 
-static void api_dcerpc_cmd_write_done(struct async_req *subreq);
+static void api_dcerpc_cmd_write_done(struct tevent_req *subreq);
 static void api_dcerpc_cmd_read_done(struct async_req *subreq);
 
 static void api_dcerpc_cmd(connection_struct *conn, struct smb_request *req,
 			   files_struct *fsp, uint8_t *data, size_t length,
 			   size_t max_read)
 {
-	struct async_req *subreq;
+	struct tevent_req *subreq;
 	struct dcerpc_cmd_state *state;
 
 	if (!fsp_is_np(fsp)) {
@@ -254,16 +254,17 @@ static void api_dcerpc_cmd(connection_struct *conn, struct smb_request *req,
 		reply_nterror(req, NT_STATUS_NO_MEMORY);
 		return;
 	}
-	subreq->async.fn = api_dcerpc_cmd_write_done;
-	subreq->async.priv = talloc_move(conn, &req);
+	tevent_req_set_callback(subreq, api_dcerpc_cmd_write_done,
+				talloc_move(conn, &req));
 }
 
-static void api_dcerpc_cmd_write_done(struct async_req *subreq)
+static void api_dcerpc_cmd_write_done(struct tevent_req *subreq)
 {
-	struct smb_request *req = talloc_get_type_abort(
-		subreq->async.priv, struct smb_request);
+	struct smb_request *req = tevent_req_callback_data(
+		subreq, struct smb_request);
 	struct dcerpc_cmd_state *state = talloc_get_type_abort(
 		req->async_priv, struct dcerpc_cmd_state);
+	struct async_req *subreq2;
 	NTSTATUS status;
 	ssize_t nwritten = -1;
 
@@ -284,15 +285,15 @@ static void api_dcerpc_cmd_write_done(struct async_req *subreq)
 		goto send;
 	}
 
-	subreq = np_read_send(req->conn, smbd_event_context(),
-			      state->handle, state->data, state->max_read);
-	if (subreq == NULL) {
+	subreq2 = np_read_send(req->conn, smbd_event_context(),
+			       state->handle, state->data, state->max_read);
+	if (subreq2 == NULL) {
 		reply_nterror(req, NT_STATUS_NO_MEMORY);
 		goto send;
 	}
 
-	subreq->async.fn = api_dcerpc_cmd_read_done;
-	subreq->async.priv = req;
+	subreq2->async.fn = api_dcerpc_cmd_read_done;
+	subreq2->async.priv = req;
 	return;
 
  send: