From 4ad1943d29a273ad3770e7abd5f266c25608eb39 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 7 May 2010 01:20:26 -0700 Subject: Make us pass all SMB2 lock tests except MULTIPLE-UNLOCK and CONTEXT. Them next :-). Jeremy. --- source3/smbd/blocking.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source3/smbd/blocking.c') diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index e78d80777e0..942237b812f 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -571,13 +571,17 @@ static bool blocking_lock_record_process(struct blocking_lock_record *blr) Called when a file is closed. *****************************************************************************/ -void cancel_pending_lock_requests_by_fid(files_struct *fsp, struct byte_range_lock *br_lck) +void cancel_pending_lock_requests_by_fid(files_struct *fsp, + struct byte_range_lock *br_lck, + enum file_close_type close_type) { struct smbd_server_connection *sconn = smbd_server_conn; struct blocking_lock_record *blr, *blr_cancelled, *next = NULL; if (sconn->allow_smb2) { - cancel_pending_lock_requests_by_fid_smb2(fsp, br_lck); + cancel_pending_lock_requests_by_fid_smb2(fsp, + br_lck, + close_type); return; } -- cgit