s3:smbd: remove struct member smbd_smb2_request.cancelled - it was only written

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 9bc6b175b5addf46aaa901ba23a823b8f4989d2b..107d338337bb33cf4f38df336621ea7250d7fed6 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -466,7 +466,6 @@ struct smbd_smb2_request {
        bool do_signing;
        bool do_encryption;
        struct tevent_timer *async_te;
-       bool cancelled;
        bool compound_related;
 
        /*

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index e188c9fa5ca97e53d259ac6b694b18892fffa39f..9318a83f489d85999c2ac003ecd3fa0a533b7014 100644 (file)
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1412,7 +1412,6 @@ static bool smbd_smb2_create_cancel(struct tevent_req *req)
        remove_deferred_open_entry(state->id, mid,
                                   messaging_server_id(smb2req->sconn->msg_ctx));
        remove_deferred_open_message_smb2_internal(smb2req, mid);
-       smb2req->cancelled = true;
 
        tevent_req_defer_callback(req, smb2req->sconn->ev_ctx);
        tevent_req_nterror(req, NT_STATUS_CANCELLED);

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index d29ecec8671ef7f35c19834a4f510de83c5f8016..e2ea2512c6a2670202c3aeaad785350890b5c534 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -380,7 +380,6 @@ static bool smbd_smb2_lock_cancel(struct tevent_req *req)
         }
 
         smb2req = state->smb2req;
-        smb2req->cancelled = true;
 
        remove_pending_lock(state, state->blr);
        tevent_req_defer_callback(req, smb2req->sconn->ev_ctx);

diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c
index 638e01ad7b56e7632b32fdcfa1b0aab0ad343ba1..81aa6152cc5b9a44fad8bdcc9881b825fad87fc2 100644 (file)
--- a/source3/smbd/smb2_notify.c
+++ b/source3/smbd/smb2_notify.c
@@ -308,7 +308,6 @@ static bool smbd_smb2_notify_cancel(struct tevent_req *req)
        struct smbd_smb2_notify_state *state = tevent_req_data(req,
                                               struct smbd_smb2_notify_state);
 
-       state->smb2req->cancelled = true;
        smbd_notify_cancel_by_smbreq(state->smbreq);
 
        return true;

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index e0c615a9c3fbb52518c334fec76f214ac8681fd9..2890f8674531cc5b3c294c78fbd3299ca194bd5f 100644 (file)
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -363,8 +363,6 @@ static bool smbd_smb2_read_cancel(struct tevent_req *req)
                tevent_req_data(req,
                struct smbd_smb2_read_state);
 
-       state->smb2req->cancelled = true;
-
        return cancel_smb2_aio(state->smbreq);
 }
 

diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 03998caba1a0bf605443ce9cef611f5627a2062b..f9cfbfcf057dde658025d12c56c11d44cc6a7e67 100644 (file)
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -236,8 +236,6 @@ static bool smbd_smb2_write_cancel(struct tevent_req *req)
                tevent_req_data(req,
                struct smbd_smb2_write_state);
 
-       state->smb2req->cancelled = true;
-
        return cancel_smb2_aio(state->smbreq);
 }