diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-01-14 04:32:57 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-01-14 04:32:57 +0000 |
| commit | 82af221e4a7e456f580f16bc5d2fd904fc018c96 (patch) | |
| tree | 1b0818867ea76a25e578345364186566c4f167c4 /source3/include | |
| parent | 7cd74b07ef283a4ce2e6f6c98cc7096189a74f20 (diff) | |
| download | samba-82af221e4a7e456f580f16bc5d2fd904fc018c96.tar.gz samba-82af221e4a7e456f580f16bc5d2fd904fc018c96.tar.bz2 samba-82af221e4a7e456f580f16bc5d2fd904fc018c96.zip | |
we now pass all byte range locking tests
the last piece was to use a smb timeout slightly larger than the
locking timeout in bloking locks to prevent a race
(This used to be commit 1b54cb4a33a65e62c2e3189b78ef073869a60c75)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/proto.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index c3bbb505a2..8618c1cd69 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -591,7 +591,7 @@ BOOL cli_close(struct cli_state *cli, int fnum); BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int timeout, enum lock_type lock_type); BOOL cli_unlock(struct cli_state *cli, int fnum, - uint32 offset, uint32 len, int timeout); + uint32 offset, uint32 len); size_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_t size); ssize_t cli_write(struct cli_state *cli, int fnum, uint16 write_mode, @@ -755,20 +755,22 @@ struct packet_struct *receive_unexpected(enum packet_type packet_type, int id, /*The following definitions come from locking/brlock.c */ void brl_init(void); -BOOL brl_lock(SMB_DEV_T dev, SMB_INO_T ino, +BOOL brl_lock(SMB_DEV_T dev, SMB_INO_T ino, int fnum, uint16 smbpid, pid_t pid, uint16 tid, br_off start, br_off size, enum lock_type lock_type); -BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, +BOOL brl_unlock(SMB_DEV_T dev, SMB_INO_T ino, int fnum, uint16 smbpid, pid_t pid, uint16 tid, br_off start, br_off size); BOOL brl_locktest(SMB_DEV_T dev, SMB_INO_T ino, uint16 smbpid, pid_t pid, uint16 tid, br_off start, br_off size, enum lock_type lock_type); +void brl_close(SMB_DEV_T dev, SMB_INO_T ino, pid_t pid, int tid, int fnum); /*The following definitions come from locking/locking.c */ +void locking_close_file(files_struct *fsp); BOOL is_locked(files_struct *fsp,connection_struct *conn, SMB_OFF_T count,SMB_OFF_T offset, enum lock_type lock_type); |