From: Stefan Metzmacher Date: Thu, 20 Sep 2012 14:16:03 +0000 (+0200) Subject: s3:smb2_lock: smbd_smb2_notify_recv() can already return NT_STATUS_CANCELED X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=65a81060093cf9d7c0ebf8d6e160625bdc87baab;p=obnox%2Fsamba%2Fsamba-obnox.git s3:smb2_lock: smbd_smb2_notify_recv() can already return NT_STATUS_CANCELED That's why we can remove the code that violates the tevent_req layers. metze --- diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c index 2c598e8d668..638e01ad7b5 100644 --- a/source3/smbd/smb2_notify.c +++ b/source3/smbd/smb2_notify.c @@ -112,24 +112,6 @@ static void smbd_smb2_request_notify_done(struct tevent_req *subreq) NTSTATUS status; NTSTATUS error; /* transport error */ - if (req->cancelled) { - struct smbd_smb2_notify_state *state = tevent_req_data(subreq, - struct smbd_smb2_notify_state); - const uint8_t *inhdr = SMBD_SMB2_IN_HDR_PTR(req); - uint64_t mid = BVAL(inhdr, SMB2_HDR_MESSAGE_ID); - - DEBUG(10,("smbd_smb2_request_notify_done: cancelled mid %llu\n", - (unsigned long long)mid )); - error = smbd_smb2_request_error(req, NT_STATUS_CANCELLED); - if (!NT_STATUS_IS_OK(error)) { - smbd_server_connection_terminate(req->sconn, - nt_errstr(error)); - return; - } - TALLOC_FREE(state->im); - return; - } - status = smbd_smb2_notify_recv(subreq, req, &out_output_buffer);