diff options
| author | Jeremy Allison <jra@samba.org> | 2010-05-07 01:20:26 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-05-07 01:20:26 -0700 |
| commit | 4ad1943d29a273ad3770e7abd5f266c25608eb39 (patch) | |
| tree | 9e52b28a8e969b2cfd487f01fa2d5990caff994a /source3/locking | |
| parent | 882fb1828f766f2c532c32472ab7ab81f03cd906 (diff) | |
| download | samba-4ad1943d29a273ad3770e7abd5f266c25608eb39.tar.gz samba-4ad1943d29a273ad3770e7abd5f266c25608eb39.tar.bz2 samba-4ad1943d29a273ad3770e7abd5f266c25608eb39.zip | |
Make us pass all SMB2 lock tests except MULTIPLE-UNLOCK and CONTEXT. Them next :-).
Jeremy.
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/locking.c | 5 |
1 files changed, 3 insertions, 2 deletions
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); } |