s3: Explicitly pass sconn to remove_pending_lock_requests_by_mid_smb1

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d263eab0b108d01f731a637a663219f89cd6ad62..8bcef3c49c53a5f244fcbdb27bc3cec9951f2345 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5370,7 +5370,8 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
 void cancel_pending_lock_requests_by_fid(files_struct *fsp,
                        struct byte_range_lock *br_lck,
                        enum file_close_type close_type);
-void remove_pending_lock_requests_by_mid_smb1(uint64_t mid);
+void remove_pending_lock_requests_by_mid_smb1(
+       struct smbd_server_connection *sconn, uint64_t mid);
 bool blocking_lock_was_deferred_smb1(uint64_t mid);
 struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp,
                        uint64_t smblctx,

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index b7228467e2020e46dadc32762e33ebfe5475c213..f87841e66dd5adde9772da711cd55d1ce4f080ea 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -632,9 +632,9 @@ void cancel_pending_lock_requests_by_fid(files_struct *fsp,
  Only called from the SMB1 cancel code.
 *****************************************************************************/
 
-void remove_pending_lock_requests_by_mid_smb1(uint64_t mid)
+void remove_pending_lock_requests_by_mid_smb1(
+       struct smbd_server_connection *sconn, uint64_t mid)
 {
-       struct smbd_server_connection *sconn = smbd_server_conn;
        struct blocking_lock_record *blr, *next = NULL;
 
        for(blr = sconn->smb1.locks.blocking_lock_queue; blr; blr = next) {

diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index fdee584282532bc2475f8f535b21c175922911f7..c5b5fee6d154bdff8a9361b5bcb6c446de3b6c34 100644 (file)
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1279,7 +1279,7 @@ void reply_ntcancel(struct smb_request *req)
        START_PROFILE(SMBntcancel);
        srv_cancel_sign_response(req->sconn);
        remove_pending_change_notify_requests_by_mid(req->sconn, req->mid);
-       remove_pending_lock_requests_by_mid_smb1(req->mid);
+       remove_pending_lock_requests_by_mid_smb1(req->sconn, req->mid);
 
        DEBUG(3,("reply_ntcancel: cancel called on mid = %llu.\n",
                (unsigned long long)req->mid));