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 f78e3502b8b33ae42895349e98a832104f26e0e7..10d657bb8385037fdf2e3c4f095af522b3604cdc 100644 (file)
--- 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 d94efd4ba6c60a3e33582267ba5b67f0579d4e99..0a73c82bad31c336e9bc0e599d481820dd30ff20 100644 (file)
--- 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 f0676a308e71a50c0b23a592ad1fc72419b771df..80b8d82c7ead4bd5fdcd82b63cd13b8bfb17a5e7 100644 (file)
--- 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);