s3: Explicitly pass sconn to process_blocking_lock_queue_smb2

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 0c4e5ce80391be4fd9ce53f5bc686d8ed65ca0e3..5ee8a97175f0f1cf7af9bf30c8bcbe22f52f6568 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -714,7 +714,7 @@ void process_blocking_lock_queue(struct smbd_server_connection *sconn)
        struct blocking_lock_record *blr, *next = NULL;
 
        if (sconn->using_smb2) {
-               process_blocking_lock_queue_smb2(tv_curr);
+               process_blocking_lock_queue_smb2(sconn, tv_curr);
                return;
        }
 

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 4f698f8717e43d28347d6d24e013c12c09bc93f0..799cf17be675f973156b3fe4c6ef4e111d5f05ee 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -317,7 +317,8 @@ bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck,
                                uint64_t offset,
                                uint64_t count,
                                uint64_t blocking_smblctx);
-void process_blocking_lock_queue_smb2(struct timeval tv_curr);
+void process_blocking_lock_queue_smb2(
+       struct smbd_server_connection *sconn, struct timeval tv_curr);
 void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp,
                        struct byte_range_lock *br_lck,
                        enum file_close_type close_type);

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 5cd8c5d5dbd8c09c6f6b0d0f54feffdd1b5ba0a0..97b782b42efba365ef51c78e0dee89bbb2243a70 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -455,7 +455,7 @@ static void received_unlock_msg(struct messaging_context *msg,
                                DATA_BLOB *data)
 {
        DEBUG(10,("received_unlock_msg (SMB2)\n"));
-       process_blocking_lock_queue_smb2(timeval_current());
+       process_blocking_lock_queue_smb2(smbd_server_conn, timeval_current());
 }
 
 /****************************************************************
@@ -819,9 +819,9 @@ static void reprocess_blocked_smb2_lock(struct smbd_smb2_request *smb2req,
  the request queue.
 *****************************************************************/
 
-void process_blocking_lock_queue_smb2(struct timeval tv_curr)
+void process_blocking_lock_queue_smb2(
+       struct smbd_server_connection *sconn, struct timeval tv_curr)
 {
-       struct smbd_server_connection *sconn = smbd_server_conn;
        struct smbd_smb2_request *smb2req, *nextreq;
 
        for (smb2req = sconn->smb2.requests; smb2req; smb2req = nextreq) {