summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-06-12 14:52:09 +0200
committerVolker Lendecke <vl@samba.org>2010-06-12 15:42:57 +0200
commit5dc2fe5fdccfcae24819f533371d8aea4280bce7 (patch)
tree958fe7def004efd24c2e19cf8abe051cb7a2a85a
parent2592928f00b0d53da1b5df328f454b9c9415754a (diff)
downloadsamba-5dc2fe5fdccfcae24819f533371d8aea4280bce7.tar.gz
samba-5dc2fe5fdccfcae24819f533371d8aea4280bce7.tar.bz2
samba-5dc2fe5fdccfcae24819f533371d8aea4280bce7.zip
s3: Explicitly pass sconn to process_blocking_lock_queue_smb2
-rw-r--r--source3/smbd/blocking.c2
-rw-r--r--source3/smbd/globals.h3
-rw-r--r--source3/smbd/smb2_lock.c6
3 files changed, 6 insertions, 5 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 0c4e5ce803..5ee8a97175 100644
--- 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 4f698f8717..799cf17be6 100644
--- 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 5cd8c5d5db..97b782b42e 100644
--- 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) {