]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Fix broken brlock for clustering
authorVolker Lendecke <vl@samba.org>
Thu, 27 Jun 2019 11:21:33 +0000 (13:21 +0200)
committerMichael Adam <obnox@samba.org>
Fri, 28 Jun 2019 15:02:21 +0000 (15:02 +0000)
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>
source3/locking/brlock.c

index 00462a31c78417de3e3fd04bf3d18bcac41e8dff..b4628831f5b7a05bbc1b4c97c193bf465586f436 100644 (file)
@@ -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) {