From 8ed9df8af219a144f5580662b3c948c3da46b4b4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 17 Mar 2008 14:40:07 +0100 Subject: [PATCH] Merge leftovers of 0e1a86bc845 in 3-0-ctdb (cherry picked from commit 64b1625f8e3bca43504871747bef6631e1b18f44) --- source/locking/brlock.c | 2 +- source/locking/locking.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/source/locking/brlock.c b/source/locking/brlock.c index 341d00f3fe0..940dfbff8fe 100644 --- a/source/locking/brlock.c +++ b/source/locking/brlock.c @@ -265,7 +265,7 @@ void brl_init(bool read_only) } brlock_db = db_open(NULL, lock_path("brlock.tdb"), lp_open_files_db_hash_size(), - TDB_DEFAULT | TDB_CLEAR_IF_FIRST, + TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST, read_only?O_RDONLY:(O_RDWR|O_CREAT), 0644 ); if (!brlock_db) { DEBUG(0,("Failed to open byte range locking database %s\n", diff --git a/source/locking/locking.c b/source/locking/locking.c index 513bb31d9da..782e10fb7cd 100644 --- a/source/locking/locking.c +++ b/source/locking/locking.c @@ -392,10 +392,9 @@ static bool locking_init_internal(bool read_only) if (lock_db) return True; - lock_db = db_open(NULL, lock_path("locking.tdb"), 0, - TDB_DEFAULT - |TDB_VOLATILE - |(read_only?0x0:TDB_CLEAR_IF_FIRST), + lock_db = db_open(NULL, lock_path("locking.tdb"), + lp_open_files_db_hash_size(), + TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST, read_only?O_RDONLY:O_RDWR|O_CREAT, 0644); if (!lock_db) { -- 2.11.4.GIT