brlock: Remove clustering special case
authorVolker Lendecke <vl@samba.org>
Sun, 26 May 2019 06:20:47 +0000 (08:20 +0200)
committerJeremy Allison <jra@samba.org>
Tue, 28 May 2019 20:27:15 +0000 (20:27 +0000)
With e7424897a127 we don't need this special case for clustering
anymore.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/locking/brlock.c

index a24ad68bf3f1ee0d1ef66542e32a8a14235d266c..31e0f857d5c319b843c4fc84dfebda7912eaaf27 100644 (file)
@@ -2099,22 +2099,13 @@ struct byte_range_lock *brl_get_locks_readonly(files_struct *fsp)
        br_lock->modified = false;
        br_lock->record = NULL;
 
-       if (lp_clustering()) {
-               /*
-                * In the cluster case we can't cache the brlock struct
-                * because dbwrap_get_seqnum does not work reliably over
-                * ctdb. Thus we have to throw away the brlock struct soon.
-                */
-               talloc_steal(talloc_tos(), br_lock);
-       } else {
-               /*
-                * Cache the brlock struct, invalidated when the dbwrap_seqnum
-                * changes. See beginning of this routine.
-                */
-               TALLOC_FREE(fsp->brlock_rec);
-               fsp->brlock_rec = br_lock;
-               fsp->brlock_seqnum = dbwrap_get_seqnum(brlock_db);
-       }
+       /*
+        * Cache the brlock struct, invalidated when the dbwrap_seqnum
+        * changes. See beginning of this routine.
+        */
+       TALLOC_FREE(fsp->brlock_rec);
+       fsp->brlock_rec = br_lock;
+       fsp->brlock_seqnum = dbwrap_get_seqnum(brlock_db);
 
        return br_lock;
 }