diff options
| author | Volker Lendecke <vl@samba.org> | 2008-03-17 14:40:07 +0100 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-03-17 14:56:45 +0100 |
| commit | 64b1625f8e3bca43504871747bef6631e1b18f44 (patch) | |
| tree | 57090d5d8b58631219a68ef04441758f3fcb2b98 | |
| parent | 46e50da0d550e43de3aaf0141c64f25e1c9997c2 (diff) | |
| download | samba-64b1625f8e3bca43504871747bef6631e1b18f44.tar.gz samba-64b1625f8e3bca43504871747bef6631e1b18f44.tar.xz samba-64b1625f8e3bca43504871747bef6631e1b18f44.zip | |
Merge leftovers of 0e1a86bc845 in 3-0-ctdb
| -rw-r--r-- | source/locking/brlock.c | 2 | ||||
| -rw-r--r-- | 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) { |