sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

s3: Explicitly pass sconn to recalc_brl_timeout

Browse Source
This commit is contained in:
Volker Lendecke 2010-06-12 14:26:32 +02:00
parent ec2079f5d0
commit cc825231cd
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/smbd/blocking.c
View File

@ -77,9 +77,8 @@ struct timeval timeval_brl_min(const struct timeval *tv1,
next processing. 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 blocking_lock_record *blr;
struct timeval next_timeout; struct timeval next_timeout;
int max_brl_timeout = lp_parm_int(-1, "brl", "recalctime", 5); 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); blr->req = talloc_move(blr, &req);
DLIST_ADD_END(sconn->smb1.locks.blocking_lock_queue, blr, struct blocking_lock_record *); 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. */ /* Ensure we'll receive messages when this is unlocked. */
if (!sconn->smb1.locks.blocking_lock_unlock_state) { 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);
} }
/**************************************************************************** /****************************************************************************