diff options
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); |