diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-07-29 03:08:05 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-07-29 03:08:05 +0000 |
| commit | 64578c0589a3a741f81fb55c16eeb882128da00b (patch) | |
| tree | 8b650156e44e4d39af8625185d857a88789b8074 /source3/locking/locking.c | |
| parent | c48b3fce6be6d5d952cbcda0ddae223dda5a576f (diff) | |
| download | samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.gz samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.xz samba-64578c0589a3a741f81fb55c16eeb882128da00b.zip | |
merge from the autoconf2 branch to the main branch
(This used to be commit 3bda7ac417107a7b01d91805ca71c4330657ed21)
Diffstat (limited to 'source3/locking/locking.c')
| -rw-r--r-- | source3/locking/locking.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index e4ca6bbb049..e303fb54821 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -88,7 +88,7 @@ BOOL is_locked(int fnum,int cnum,uint32 count,uint32 offset, int lock_type) * Note that most UNIX's can *test* for a write lock on * a read-only fd, just not *set* a write lock on a read-only * fd. So we don't need to use map_lock_type here. - */ + */ return(fcntl_lock(fsp->fd_ptr->fd,F_GETLK,offset,count,lock_type)); } @@ -161,13 +161,10 @@ BOOL locking_init(int read_only) #ifdef FAST_SHARE_MODES share_ops = locking_shm_init(read_only); - if (!share_ops) { - DEBUG(0,("ERROR: Failed to initialise fast share modes - trying slow code\n")); - } - if (share_ops) return True; -#endif - +#else share_ops = locking_slow_init(read_only); +#endif + if (!share_ops) { DEBUG(0,("ERROR: Failed to initialise share modes!\n")); return False; |