diff options
author | Volker Lendecke <vl@sernet.de> | 2007-12-05 20:53:22 +0100 |
---|---|---|
committer | Volker Lendecke <vl@samba.org> | 2007-12-10 12:22:01 +0100 |
commit | 2f3c865707010bc7c463a02782dbee3dc2479da1 (patch) | |
tree | 74ba21daacb7e7d5b76c4d036240faa247ee6dc0 /source/locking | |
parent | 1f317f471af72f8bbc6c9fdd3e79a27c59e6fb6e (diff) | |
download | samba-2f3c865707010bc7c463a02782dbee3dc2479da1.tar.gz samba-2f3c865707010bc7c463a02782dbee3dc2479da1.tar.xz samba-2f3c865707010bc7c463a02782dbee3dc2479da1.zip |
Tiny simplifications
locking.c:open_read_only was unused
don't export the silly boolean flag locking_init(bool read_only)
Diffstat (limited to 'source/locking')
-rw-r--r-- | source/locking/brlock.c | 7 | ||||
-rw-r--r-- | source/locking/locking.c | 24 | ||||
-rw-r--r-- | source/locking/posix.c | 2 |
3 files changed, 17 insertions, 16 deletions
diff --git a/source/locking/brlock.c b/source/locking/brlock.c index f821761cd70..eb42d081fed 100644 --- a/source/locking/brlock.c +++ b/source/locking/brlock.c @@ -258,7 +258,7 @@ static NTSTATUS brl_lock_failed(files_struct *fsp, const struct lock_struct *loc Open up the brlock.tdb database. ****************************************************************************/ -void brl_init(int read_only) +void brl_init(bool read_only) { if (brlock_db) { return; @@ -279,11 +279,8 @@ void brl_init(int read_only) Close down the brlock.tdb database. ****************************************************************************/ -void brl_shutdown(int read_only) +void brl_shutdown(void) { - if (!brlock_db) { - return; - } TALLOC_FREE(brlock_db); } diff --git a/source/locking/locking.c b/source/locking/locking.c index 296323f7da2..dab21e53b3b 100644 --- a/source/locking/locking.c +++ b/source/locking/locking.c @@ -385,9 +385,7 @@ void locking_close_file(struct messaging_context *msg_ctx, Initialise the locking functions. ****************************************************************************/ -static int open_read_only; - -bool locking_init(int read_only) +static bool locking_init_internal(bool read_only) { brl_init(read_only); @@ -408,22 +406,28 @@ bool locking_init(int read_only) if (!posix_locking_init(read_only)) return False; - open_read_only = read_only; - return True; } +bool locking_init(void) +{ + return locking_init_internal(false); +} + +bool locking_init_readonly(void) +{ + return locking_init_internal(true); +} + /******************************************************************* Deinitialize the share_mode management. ******************************************************************/ bool locking_end(void) { - brl_shutdown(open_read_only); - if (lock_db) { - TALLOC_FREE(lock_db); - } - return True; + brl_shutdown(); + TALLOC_FREE(lock_db); + return true; } /******************************************************************* diff --git a/source/locking/posix.c b/source/locking/posix.c index 7669b140f68..4b0b91bd197 100644 --- a/source/locking/posix.c +++ b/source/locking/posix.c @@ -347,7 +347,7 @@ static TDB_DATA fd_array_key_fsp(files_struct *fsp) Create the in-memory POSIX lock databases. ********************************************************************/ -bool posix_locking_init(int read_only) +bool posix_locking_init(bool read_only) { if (posix_pending_close_tdb) { return True; |