diff options
| author | Volker Lendecke <vl@samba.org> | 2010-06-12 13:08:31 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-06-12 15:42:50 +0200 |
| commit | 3087986e768e4d79d321dcb2062f883237b0794a (patch) | |
| tree | 3bb954a1db983f651a9b935ee69f0a20ec3f48f9 /source3 | |
| parent | 546a264e0e2b6bc31768cee4bc2ce478019d2c42 (diff) | |
| download | samba-3087986e768e4d79d321dcb2062f883237b0794a.tar.gz samba-3087986e768e4d79d321dcb2062f883237b0794a.tar.bz2 samba-3087986e768e4d79d321dcb2062f883237b0794a.zip | |
s3: Remove sconn arg from smbd_notify_cancel_by_smbreq
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/globals.h | 3 | ||||
| -rw-r--r-- | source3/smbd/notify.c | 4 | ||||
| -rw-r--r-- | source3/smbd/smb2_notify.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 8e1babf304..91712ea3c9 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -237,8 +237,7 @@ NTSTATUS smbd_check_open_rights(struct connection_struct *conn, uint32_t access_mask, uint32_t *access_granted); -void smbd_notify_cancel_by_smbreq(struct smbd_server_connection *sconn, - const struct smb_request *smbreq); +void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq); void smbd_server_connection_terminate_ex(struct smbd_server_connection *sconn, const char *reason, diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c index 5df389fc20..202664fc94 100644 --- a/source3/smbd/notify.c +++ b/source3/smbd/notify.c @@ -318,9 +318,9 @@ void remove_pending_change_notify_requests_by_mid(uint64_t mid) change_notify_remove_request(map->req); } -void smbd_notify_cancel_by_smbreq(struct smbd_server_connection *sconn, - const struct smb_request *smbreq) +void smbd_notify_cancel_by_smbreq(const struct smb_request *smbreq) { + struct smbd_server_connection *sconn = smbreq->sconn; struct notify_mid_map *map; for (map = sconn->smb1.notify_mid_maps; map; map = map->next) { diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c index bffa651b1e..8b23caeb94 100644 --- a/source3/smbd/smb2_notify.c +++ b/source3/smbd/smb2_notify.c @@ -380,8 +380,7 @@ 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); - smbd_notify_cancel_by_smbreq(state->smb2req->sconn, - state->smbreq); + smbd_notify_cancel_by_smbreq(state->smbreq); state->smb2req->cancelled = true; tevent_req_done(req); |