From: Ralph Boehme <slow@samba.org>
Date: Mon, 22 Sep 2025 15:28:23 +0000 (+0200)
Subject: smbd: move lp_locking() check inside file_has_brlocks()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d31c8ff25cd55106ac43aa3a041b96a956e53f9e;p=thirdparty%2Fsamba.git

smbd: move lp_locking() check inside file_has_brlocks()

Avoids doing the check at every caller.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index e0f5c14c302..39480a3275b 100644
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -2004,6 +2004,10 @@ bool file_has_brlocks(files_struct *fsp)
 	struct byte_range_lock *br_lck = NULL;
 	uint i, num_locks;
 
+	if (!lp_locking(fsp->conn->params)) {
+		return false;
+	}
+
 	br_lck = brl_get_locks_readonly(fsp);
 	if (br_lck == NULL) {
 		return false;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index b0a080fabf2..00bfa3e003e 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -2486,7 +2486,7 @@ grant:
 		}
 	}
 
-	if (lp_locking(fsp->conn->params) && file_has_brlocks(fsp)) {
+	if (file_has_brlocks(fsp)) {
 		DBG_DEBUG("file %s has byte range locks\n",
 			  fsp_str_dbg(fsp));
 		granted &= ~(SMB2_LEASE_READ | SMB2_LEASE_HANDLE);