From f856fb0b359a21a786a62ea9f70043afcd6f8373 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 12 Jun 2010 14:23:12 +0200 Subject: s3: Explicitly pass sconn to remove_pending_lock_requests_by_mid_smb1 --- source3/smbd/blocking.c | 4 ++-- source3/smbd/nttrans.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 b7228467e2..f87841e66d 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -632,9 +632,9 @@ void cancel_pending_lock_requests_by_fid(files_struct *fsp, Only called from the SMB1 cancel code. *****************************************************************************/ -void remove_pending_lock_requests_by_mid_smb1(uint64_t mid) +void remove_pending_lock_requests_by_mid_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/nttrans.c b/source3/smbd/nttrans.c index fdee584282..c5b5fee6d1 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1279,7 +1279,7 @@ void reply_ntcancel(struct smb_request *req) START_PROFILE(SMBntcancel); srv_cancel_sign_response(req->sconn); remove_pending_change_notify_requests_by_mid(req->sconn, req->mid); - remove_pending_lock_requests_by_mid_smb1(req->mid); + remove_pending_lock_requests_by_mid_smb1(req->sconn, req->mid); DEBUG(3,("reply_ntcancel: cancel called on mid = %llu.\n", (unsigned long long)req->mid)); -- cgit