sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-05 20:58:40 +03:00
Code

damn, Solaris already has a "enum lock_type"

Browse Source 
changed it to "enum brl_type"
This commit is contained in:
Andrew Tridgell -
parent 1b54cb4a33
commit 6b9ee7662c
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/include/proto.h
View File

@ -589,9 +589,8 @@ int cli_nt_create(struct cli_state *cli, char *fname);
int cli_open(struct cli_state *cli, char *fname, int flags, int share_mode);
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);
uint32 offset, uint32 len, int timeout, enum brl_type lock_type);
BOOL cli_unlock(struct cli_state *cli, int fnum, 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,
@ -758,14 +757,14 @@ void brl_init(void);
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);
enum brl_type lock_type);
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);
enum brl_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 */
@ -773,9 +772,9 @@ void brl_close(SMB_DEV_T dev, SMB_INO_T ino, pid_t pid, int tid, int fnum);
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);
enum brl_type lock_type);
BOOL do_lock(files_struct *fsp,connection_struct *conn,
SMB_OFF_T count,SMB_OFF_T offset,enum lock_type lock_type,
SMB_OFF_T count,SMB_OFF_T offset,enum brl_type lock_type,
int *eclass,uint32 *ecode);
BOOL do_unlock(files_struct *fsp,connection_struct *conn,
SMB_OFF_T count,SMB_OFF_T offset,

2
source/include/smb.h
View File

@ -906,7 +906,7 @@ typedef enum
} parm_class;
/* passed to br lock code */
enum lock_type {READ_LOCK, WRITE_LOCK};
enum brl_type {READ_LOCK, WRITE_LOCK};
struct enum_list {
int value;

2
source/libsmb/clientgen.c
View File

@ -1345,7 +1345,7 @@ BOOL cli_close(struct cli_state *cli, int fnum)
lock a file
****************************************************************************/
BOOL cli_lock(struct cli_state *cli, int fnum,
uint32 offset, uint32 len, int timeout, enum lock_type lock_type)
uint32 offset, uint32 len, int timeout, enum brl_type lock_type)
{
char *p;
int saved_timeout = cli->timeout;

9
source/locking/brlock.c
View File

@ -44,7 +44,7 @@ struct lock_struct {
br_off start;
br_off size;
int fnum;
enum lock_type lock_type;
enum brl_type lock_type;
};
/* the key used in the brlock database */
@ -74,7 +74,8 @@ see if lock2 can be added when lock1 is in place
static BOOL brl_conflict(struct lock_struct *lck1,
struct lock_struct *lck2)
{
if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK) return False;
if (lck1->lock_type == READ_LOCK && lck2->lock_type == READ_LOCK)
return False;
if (brl_same_context(&lck1->context, &lck2->context) &&
lck2->lock_type == READ_LOCK) return False;
@ -106,7 +107,7 @@ lock a range of bytes
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)
enum brl_type lock_type)
{
struct lock_key key;
TDB_DATA kbuf, dbuf;
@ -231,7 +232,7 @@ test if we could add a lock if we wanted to
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)
enum brl_type lock_type)
{
struct lock_key key;
TDB_DATA kbuf, dbuf;

4
source/locking/locking.c
View File

@ -58,7 +58,7 @@ 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)
enum brl_type lock_type)
{
int snum = SNUM(conn);
@ -78,7 +78,7 @@ BOOL is_locked(files_struct *fsp,connection_struct *conn,
Utility function called by locking requests.
****************************************************************************/
BOOL do_lock(files_struct *fsp,connection_struct *conn,
SMB_OFF_T count,SMB_OFF_T offset,enum lock_type lock_type,
SMB_OFF_T count,SMB_OFF_T offset,enum brl_type lock_type,
int *eclass,uint32 *ecode)
{
BOOL ok = False;