diff options
| author | Michael Adam <obnox@samba.org> | 2012-09-22 02:05:18 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-09-28 09:23:08 +0200 |
| commit | e17df2be46e000f18651510ac1821fad14a325dc (patch) | |
| tree | d143ec7bae8b2681c74337367e41d3198463a67a | |
| parent | 829d9dc5bf45853756c7c1a61870764e5be61fc1 (diff) | |
| download | samba-e17df2be46e000f18651510ac1821fad14a325dc.tar.gz | |
s3:smbd: remove struct member smbd_smb2_request.cancelled - it was only written (cherry picked from commit 88d051f7f18ff88ec5385fdc798f051659134bd3)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/smbd/globals.h | 1 | ||||
| -rw-r--r-- | source3/smbd/smb2_create.c | 1 | ||||
| -rw-r--r-- | source3/smbd/smb2_lock.c | 1 | ||||
| -rw-r--r-- | source3/smbd/smb2_notify.c | 1 | ||||
| -rw-r--r-- | source3/smbd/smb2_read.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_write.c | 2 |
6 files changed, 0 insertions, 8 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index c86d7bf1d44..89ad10993db 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -465,7 +465,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 70ef3246616..aff934f4b2b 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -1411,7 +1411,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 d29ecec8671..e2ea2512c6a 100644 --- 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 638e01ad7b5..81aa6152cc5 100644 --- 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 e0c615a9c3f..2890f867453 100644 --- 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 03998caba1a..f9cfbfcf057 100644 --- 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); } |