s3: smbd: Remove lock_flav parameter from smbd_do_locks_try().

This is now contained in the struct smbd_lock_element for
each lock.

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 ef2fe321f5c296601839a508d64594c02bcb0a5a..b78768ba609eb59f9fe1e0a17ce92dfa88d8ab05 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -31,7 +31,6 @@
 
 NTSTATUS smbd_do_locks_try(
        struct files_struct *fsp,
-       enum brl_flavour lock_flav,
        uint16_t num_locks,
        struct smbd_lock_element *locks,
        uint16_t *blocker_idx,
@@ -52,7 +51,7 @@ NTSTATUS smbd_do_locks_try(
                        e->count,
                        e->offset,
                        e->brltype,
-                       lock_flav,
+                       e->lock_flav,
                        blocking_pid,
                        blocking_smblctx);
                if (!NT_STATUS_IS_OK(status)) {
@@ -75,7 +74,7 @@ NTSTATUS smbd_do_locks_try(
                          e->smblctx,
                          e->count,
                          e->offset,
-                         lock_flav);
+                         e->lock_flav);
        }
 
        return status;
@@ -437,7 +436,6 @@ static NTSTATUS smbd_smb1_do_locks_check(
 
        status = smbd_do_locks_try(
                fsp,
-               lock_flav,
                num_locks,
                locks,
                blocker_idx,

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 3b0d34514c953f53264f156bed2c55475b49cf97..a39eba9024d4376170fce93bb8eeefe913445eeb 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -99,7 +99,6 @@ bool aio_add_req_to_fsp(files_struct *fsp, struct tevent_req *req);
 
 NTSTATUS smbd_do_locks_try(
        struct files_struct *fsp,
-       enum brl_flavour lock_flav,
        uint16_t num_locks,
        struct smbd_lock_element *locks,
        uint16_t *blocker_idx,

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 23f76e1a205f754ae1b44b393b2419fe7ed4a76f..57f55e6142fb67eb5ea76799931d0b2cc1f9c582 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -570,7 +570,6 @@ static void smbd_smb2_lock_try(struct tevent_req *req)
 
        status = smbd_do_locks_try(
                state->fsp,
-               WINDOWS_LOCK,
                state->lock_count,
                state->locks,
                &blocker_idx,