s3: Remove sconn arg from smbd_notify_cancel_by_smbreq

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 8e1babf304886ab1048f030d08926dde5acf0be2..91712ea3c91bb966a9998c39cf7783323c6f3e97 100644 (file)
--- 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 5df389fc20e2bef480f954de12dad0dfc14955fe..202664fc9403608ad73873ef1fd66bf759e32f5e 100644 (file)
--- 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 bffa651b1e49c74c7506c3fe44c3cd7b239f0f16..8b23caeb9408a7ce863bac1a91c157e22e5b9826 100644 (file)
--- 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);