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/smbd/blocking.c | |
| 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/smbd/blocking.c')
| -rw-r--r-- | source3/smbd/blocking.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index e78d80777e..942237b812 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; } |