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/locking/locking.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/locking') diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 63bcff17ac..dc43f9e182 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -396,7 +396,8 @@ NTSTATUS do_lock_cancel(files_struct *fsp, ****************************************************************************/ void locking_close_file(struct messaging_context *msg_ctx, - files_struct *fsp) + files_struct *fsp, + enum file_close_type close_type) { struct byte_range_lock *br_lck; @@ -415,7 +416,7 @@ void locking_close_file(struct messaging_context *msg_ctx, br_lck = brl_get_locks(talloc_tos(),fsp); if (br_lck) { - cancel_pending_lock_requests_by_fid(fsp, br_lck); + cancel_pending_lock_requests_by_fid(fsp, br_lck, close_type); brl_close_fnum(msg_ctx, br_lck); TALLOC_FREE(br_lck); } -- cgit