Merge leftovers of 0e1a86bc845 in 3-0-ctdb

diff --git a/source/locking/brlock.c b/source/locking/brlock.c
index 341d00f3fe0aac5d0b77cedce5b83f88c43077d8..940dfbff8feb24f3e434bf139a5a1bdb042ca621 100644 (file)
--- 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 513bb31d9da7b4e34aa24a43a24c4525d7f0e5f8..782e10fb7cd9ea73f6b095a32ca493bc9bae1d45 100644 (file)
--- 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) {