summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2019-06-27 13:21:33 +0200
committerMichael Adam <obnox@samba.org>2019-06-28 15:02:21 +0000
commitc88240e0e70279207611a0aba4554cb907275e42 (patch)
treef7f1ac2f19e43cb138c278de1bd7079415fdc6c3
parentfee8cf326bfe240d3a8720569eab43f474349aff (diff)
downloadsamba-c88240e0e70279207611a0aba4554cb907275e42.tar.gz
smbd: Fix broken brlock for clustering
This should have been in f11c5887f4fb4b766, sorry. We now always need TDB_SEQNUM on brlock.tdb. Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/locking/brlock.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 00462a31c78..b4628831f5b 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -288,16 +288,12 @@ void brl_init(bool read_only)
return;
}
- tdb_flags = TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH;
-
- if (!lp_clustering()) {
- /*
- * We can't use the SEQNUM trick to cache brlock
- * entries in the clustering case because ctdb seqnum
- * propagation has a delay.
- */
- tdb_flags |= TDB_SEQNUM;
- }
+ tdb_flags =
+ TDB_DEFAULT|
+ TDB_VOLATILE|
+ TDB_CLEAR_IF_FIRST|
+ TDB_INCOMPATIBLE_HASH|
+ TDB_SEQNUM;
db_path = lock_path(talloc_tos(), "brlock.tdb");
if (db_path == NULL) {