summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-09-22 02:05:18 +0200
committerMichael Adam <obnox@samba.org>2012-09-22 10:19:00 +0200
commit88d051f7f18ff88ec5385fdc798f051659134bd3 (patch)
treef2c7d92c6324921dfd06e3f50fe94e4d536e87b1
parent603f9bfa4cf7910e1c1cae1a8d0741a6d0874baa (diff)
downloadsamba-88d051f7f18ff88ec5385fdc798f051659134bd3.tar.gz
samba-88d051f7f18ff88ec5385fdc798f051659134bd3.tar.bz2
samba-88d051f7f18ff88ec5385fdc798f051659134bd3.zip
s3:smbd: remove struct member smbd_smb2_request.cancelled - it was only written
-rw-r--r--source3/smbd/globals.h1
-rw-r--r--source3/smbd/smb2_create.c1
-rw-r--r--source3/smbd/smb2_lock.c1
-rw-r--r--source3/smbd/smb2_notify.c1
-rw-r--r--source3/smbd/smb2_read.c2
-rw-r--r--source3/smbd/smb2_write.c2
6 files changed, 0 insertions, 8 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 9bc6b175b5..107d338337 100644
--- 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 e188c9fa5c..9318a83f48 100644
--- 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 d29ecec867..e2ea2512c6 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 638e01ad7b..81aa6152cc 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 e0c615a9c3..2890f86745 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 03998caba1..f9cfbfcf05 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);
}