summaryrefslogtreecommitdiff
path: root/source3/smbd/blocking.c
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-06-12 14:31:04 +0200
committerVolker Lendecke <vl@samba.org>2010-06-12 15:42:56 +0200
commit330a64c72b1eb9f2fd87a74df82d54249c5f2b36 (patch)
tree016a82d39cbce5556b5fdcb4687bfdfb06e1dc8e /source3/smbd/blocking.c
parentcb03710c76b120c5aa3e8a5df2001ffca015b80b (diff)
downloadsamba-330a64c72b1eb9f2fd87a74df82d54249c5f2b36.tar.gz
samba-330a64c72b1eb9f2fd87a74df82d54249c5f2b36.tar.bz2
samba-330a64c72b1eb9f2fd87a74df82d54249c5f2b36.zip
s3: Explicitly pass sconn to process_blocking_lock_queue
Diffstat (limited to 'source3/smbd/blocking.c')
-rw-r--r--source3/smbd/blocking.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index ea271784a3..0c4e5ce803 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -53,7 +53,7 @@ void brl_timeout_fn(struct event_context *event_ctx,
change_to_root_user(); /* TODO: Possibly run all timed events as
* root */
- process_blocking_lock_queue();
+ process_blocking_lock_queue(sconn);
}
/****************************************************************************
@@ -701,16 +701,15 @@ static void received_unlock_msg(struct messaging_context *msg,
DATA_BLOB *data)
{
DEBUG(10,("received_unlock_msg\n"));
- process_blocking_lock_queue();
+ process_blocking_lock_queue(smbd_server_conn);
}
/****************************************************************************
Process the blocking lock queue. Note that this is only called as root.
*****************************************************************************/
-void process_blocking_lock_queue(void)
+void process_blocking_lock_queue(struct smbd_server_connection *sconn)
{
- struct smbd_server_connection *sconn = smbd_server_conn;
struct timeval tv_curr = timeval_current();
struct blocking_lock_record *blr, *next = NULL;