From: Jeremy Allison <jra@samba.org>
Date: Wed, 17 Nov 2021 00:56:02 +0000 (-0800)
Subject: s3: smbd: Remove lock_flav argument from smbd_smb1_brl_finish_by_lock().
X-Git-Tag: tdb-1.4.6~188
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07c74582c0f9fd74d00a667879787cdde1de3fb3;p=thirdparty%2Fsamba.git

s3: smbd: Remove lock_flav argument from smbd_smb1_brl_finish_by_lock().

We lookup the lock array from the state stored in the passed-in req
and all the locks in an array are always the same flavour, so this
isn't needed.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
---

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index f78e3502b8b..10d657bb838 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -687,7 +687,6 @@ void smbd_smb1_brl_finish_by_req(struct tevent_req *req, NTSTATUS status)
 bool smbd_smb1_brl_finish_by_lock(
 	struct files_struct *fsp,
 	bool large_offset,
-	enum brl_flavour lock_flav,
 	struct smbd_lock_element lock,
 	NTSTATUS finish_status)
 {
@@ -705,8 +704,7 @@ bool smbd_smb1_brl_finish_by_lock(
 
 		DBG_DEBUG("i=%zu, req=%p\n", i, req);
 
-		if ((state->large_offset != large_offset) ||
-		    (state->locks[0].lock_flav != lock_flav)) {
+		if (state->large_offset != large_offset) {
 			continue;
 		}
 
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index d94efd4ba6c..0a73c82bad3 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -122,7 +122,6 @@ void smbd_smb1_brl_finish_by_req(struct tevent_req *req, NTSTATUS status);
 bool smbd_smb1_brl_finish_by_lock(
 	struct files_struct *fsp,
 	bool large_offset,
-	enum brl_flavour lock_flav,
 	struct smbd_lock_element lock,
 	NTSTATUS finish_status);
 bool smbd_smb1_brl_finish_by_mid(
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index f0676a308e7..80b8d82c7ea 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8360,7 +8360,6 @@ void reply_lockingX(struct smb_request *req)
 		ok = smbd_smb1_brl_finish_by_lock(
 			fsp,
 			large_file_format,
-			WINDOWS_LOCK,
 			ulocks[0],
 			NT_STATUS_OK);
 		if (ok) {
@@ -8426,7 +8425,6 @@ void reply_lockingX(struct smb_request *req)
 		ok = smbd_smb1_brl_finish_by_lock(
 			fsp,
 			large_file_format,
-			WINDOWS_LOCK,
 			locks[0], /* Windows only cancels the first lock */
 			NT_STATUS_FILE_LOCK_CONFLICT);