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/include | |
| 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/include')
| -rw-r--r-- | source3/include/proto.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index e16cae5b2b..f05f76b961 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -3473,7 +3473,8 @@ NTSTATUS do_lock_cancel(files_struct *fsp, enum brl_flavour lock_flav, struct blocking_lock_record *blr); void locking_close_file(struct messaging_context *msg_ctx, - files_struct *fsp); + files_struct *fsp, + enum file_close_type close_type); bool locking_init(void); bool locking_init_readonly(void); bool locking_end(void); @@ -6002,7 +6003,9 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck, uint64_t offset, uint64_t count, uint32 blocking_pid); -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); void remove_pending_lock_requests_by_mid_smb1(uint64_t mid); bool blocking_lock_was_deferred_smb1(uint64_t mid); struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp, |