From: Volker Lendecke <vl@samba.org>
Date: Sun, 26 May 2019 06:20:47 +0000 (+0200)
Subject: brlock: Remove clustering special case
X-Git-Tag: ldb-2.0.5~606
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f11c5887f4fb4b766f23c82b84b5aedb79eb3f43;p=thirdparty%2Fsamba.git

brlock: Remove clustering special case

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>
---

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index a24ad68bf3f..31e0f857d5c 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -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;
 }