s3:smb2_read: make it possible to cancel aio reads

metze

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index c3cbbe8084ca66668d28bd9cd18d6f593f25a206..08622092c6441fd85e25e935f379b1218b80eb26 100644 (file)
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -169,6 +169,7 @@ static void smbd_smb2_request_read_done(struct tevent_req *subreq)
 
 struct smbd_smb2_read_state {
        struct smbd_smb2_request *smb2req;
+       struct smb_request *smbreq;
        files_struct *fsp;
        uint64_t in_file_id_volatile;
        uint32_t in_length;
@@ -364,6 +365,17 @@ NTSTATUS smb2_read_complete(struct tevent_req *req, ssize_t nread, int err)
        return NT_STATUS_OK;
 }
 
+static bool smbd_smb2_read_cancel(struct tevent_req *req)
+{
+       struct smbd_smb2_read_state *state =
+               tevent_req_data(req,
+               struct smbd_smb2_read_state);
+
+       state->smb2req->cancelled = true;
+
+       return cancel_smb2_aio(state->smbreq);
+}
+
 static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
                                              struct tevent_context *ev,
                                              struct smbd_smb2_request *smb2req,
@@ -403,6 +415,7 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
        if (tevent_req_nomem(smbreq, req)) {
                return tevent_req_post(req, ev);
        }
+       state->smbreq = smbreq;
 
        fsp = file_fsp(smbreq, (uint16_t)in_file_id_volatile);
        if (fsp == NULL) {
@@ -466,8 +479,10 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
 
        if (NT_STATUS_IS_OK(status)) {
                /*
-                * Doing an async read.
+                * Doing an async read, allow this
+                * request to be canceled
                 */
+               tevent_req_set_cancel_fn(req, smbd_smb2_read_cancel);
                return req;
        }