diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-01-14 08:01:44 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-01-14 08:01:44 +0000 |
| commit | 7bc1cc7e07991641d436b2c8a35b52663d4c5c05 (patch) | |
| tree | 49b7da4ce534188c8a7c3ed36ff187434ae6eb5a /source3/locking | |
| parent | 82af221e4a7e456f580f16bc5d2fd904fc018c96 (diff) | |
| download | samba-7bc1cc7e07991641d436b2c8a35b52663d4c5c05.tar.gz samba-7bc1cc7e07991641d436b2c8a35b52663d4c5c05.tar.bz2 samba-7bc1cc7e07991641d436b2c8a35b52663d4c5c05.zip | |
damn, Solaris already has a "enum lock_type"
changed it to "enum brl_type"
(This used to be commit 6b9ee7662c7afa70f6b20889e6b0ae1dcd677f9f)
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 9 | ||||
| -rw-r--r-- | source3/locking/locking.c | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 653a40728b..11766433fc 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -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; diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 350057d1a7..5348659917 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -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; |