summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2010-06-12 14:26:32 +0200
committerVolker Lendecke <vl@samba.org>2010-06-12 15:42:56 +0200
commitcc825231cd50c5214dc6167a441432a7751413bc (patch)
treefbd37b2cf8b43037967dd677a1ff00b51dde444c
parentec2079f5d0d41aa580008efc43c9019764a68ec3 (diff)
downloadsamba-cc825231cd50c5214dc6167a441432a7751413bc.tar.gz
samba-cc825231cd50c5214dc6167a441432a7751413bc.tar.bz2
samba-cc825231cd50c5214dc6167a441432a7751413bc.zip
s3: Explicitly pass sconn to recalc_brl_timeout
-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 36e850a95b..1d5b8613fb 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -77,9 +77,8 @@ struct timeval timeval_brl_min(const struct timeval *tv1,
next processing.
****************************************************************************/
-static bool recalc_brl_timeout(void)
+static bool recalc_brl_timeout(struct smbd_server_connection *sconn)
{
- struct smbd_server_connection *sconn = smbd_server_conn;
struct blocking_lock_record *blr;
struct timeval next_timeout;
int max_brl_timeout = lp_parm_int(-1, "brl", "recalctime", 5);
@@ -245,7 +244,7 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck,
blr->req = talloc_move(blr, &req);
DLIST_ADD_END(sconn->smb1.locks.blocking_lock_queue, blr, struct blocking_lock_record *);
- recalc_brl_timeout();
+ recalc_brl_timeout(sconn);
/* Ensure we'll receive messages when this is unlocked. */
if (!sconn->smb1.locks.blocking_lock_unlock_state) {
@@ -805,7 +804,7 @@ void process_blocking_lock_queue(void)
}
}
- recalc_brl_timeout();
+ recalc_brl_timeout(sconn);
}
/****************************************************************************