From ec2079f5d0d41aa580008efc43c9019764a68ec3 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 12 Jun 2010 14:25:08 +0200 Subject: s3: Explicitly pass sconn to blocking_lock_was_deferred_smb1 --- source3/smbd/blocking.c | 4 ++-- source3/smbd/trans2.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index f87841e66d..36e850a95b 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -677,9 +677,9 @@ void remove_pending_lock_requests_by_mid_smb1( Currently only called from the SMB1 unix extensions POSIX lock code. *****************************************************************************/ -bool blocking_lock_was_deferred_smb1(uint64_t mid) +bool blocking_lock_was_deferred_smb1( + struct smbd_server_connection *sconn, uint64_t mid) { - struct smbd_server_connection *sconn = smbd_server_conn; struct blocking_lock_record *blr, *next = NULL; for(blr = sconn->smb1.locks.blocking_lock_queue; blr; blr = next) { diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 6d15fda648..47435419dd 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -7972,7 +7972,7 @@ static void call_trans2setfilepathinfo(connection_struct *conn, /* We have re-scheduled this call. */ return; } - if (blocking_lock_was_deferred_smb1(req->mid)) { + if (blocking_lock_was_deferred_smb1(req->sconn, req->mid)) { /* We have re-scheduled this call. */ return; } -- cgit