s3: smbd: Remove now redundent lock_flav parameter from smbd_do_unlocking().

We already stored this in struct smbd_lock_element.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Thu Jan  6 16:03:28 UTC 2022 on sn-devel-184

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 4fa8ebd8355e6f98d056d17edb582dad871c2472..eef38f00a4ed7abc717a5d918487d9a8d4518ad8 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -118,8 +118,7 @@ struct GUID smbd_request_guid(struct smb_request *smb1req, uint16_t idx);
 NTSTATUS smbd_do_unlocking(struct smb_request *req,
                           files_struct *fsp,
                           uint16_t num_ulocks,
-                          struct smbd_lock_element *ulocks,
-                          enum brl_flavour lock_flav);
+                          struct smbd_lock_element *ulocks);
 
 NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
                               TALLOC_CTX *mem_ctx,

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 80b8d82c7ead4bd5fdcd82b63cd13b8bfb17a5e7..ac5f253b3537732aabf4c305dceed243bc890e1d 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4847,7 +4847,7 @@ void reply_writeunlock(struct smb_request *req)
                        .offset = startpos,
                        .count = numtowrite,
                };
-               status = smbd_do_unlocking(req, fsp, 1, &l, WINDOWS_LOCK);
+               status = smbd_do_unlocking(req, fsp, 1, &l);
                if (NT_STATUS_V(status)) {
                        reply_nterror(req, status);
                        goto out;
@@ -6130,7 +6130,7 @@ void reply_unlock(struct smb_request *req)
                .count = IVAL(req->vwv+1, 0),
        };
 
-       status = smbd_do_unlocking(req, fsp, 1, &lck, WINDOWS_LOCK);
+       status = smbd_do_unlocking(req, fsp, 1, &lck);
 
        if (!NT_STATUS_IS_OK(status)) {
                reply_nterror(req, status);
@@ -8112,7 +8112,6 @@ struct smbd_do_unlocking_state {
        struct files_struct *fsp;
        uint16_t num_ulocks;
        struct smbd_lock_element *ulocks;
-       enum brl_flavour lock_flav;
        NTSTATUS status;
 };
 
@@ -8124,7 +8123,6 @@ static void smbd_do_unlocking_fn(
 {
        struct smbd_do_unlocking_state *state = private_data;
        struct files_struct *fsp = state->fsp;
-       enum brl_flavour lock_flav = state->lock_flav;
        uint16_t i;
 
        for (i = 0; i < state->num_ulocks; i++) {
@@ -8144,7 +8142,7 @@ static void smbd_do_unlocking_fn(
                }
 
                state->status = do_unlock(
-                       fsp, e->smblctx, e->count, e->offset, lock_flav);
+                       fsp, e->smblctx, e->count, e->offset, e->lock_flav);
 
                DBG_DEBUG("do_unlock returned %s\n",
                          nt_errstr(state->status));
@@ -8160,14 +8158,12 @@ static void smbd_do_unlocking_fn(
 NTSTATUS smbd_do_unlocking(struct smb_request *req,
                           files_struct *fsp,
                           uint16_t num_ulocks,
-                          struct smbd_lock_element *ulocks,
-                          enum brl_flavour lock_flav)
+                          struct smbd_lock_element *ulocks)
 {
        struct smbd_do_unlocking_state state = {
                .fsp = fsp,
                .num_ulocks = num_ulocks,
                .ulocks = ulocks,
-               .lock_flav = lock_flav,
        };
        NTSTATUS status;
 
@@ -8371,7 +8367,7 @@ void reply_lockingX(struct smb_request *req)
                }
 
                status = smbd_do_unlocking(
-                       req, fsp, num_ulocks, ulocks, WINDOWS_LOCK);
+                       req, fsp, num_ulocks, ulocks);
                TALLOC_FREE(ulocks);
                if (!NT_STATUS_IS_OK(status)) {
                        END_PROFILE(SMBlockingX);

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 57f55e6142fb67eb5ea76799931d0b2cc1f9c582..8d4b8b2e853781d7764a7eb1574bd4f07fe34e67 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -457,7 +457,7 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
 
        if (isunlock) {
                status = smbd_do_unlocking(
-                       state->smb1req, fsp, in_lock_count, locks, WINDOWS_LOCK);
+                       state->smb1req, fsp, in_lock_count, locks);
 
                if (tevent_req_nterror(req, status)) {
                        return tevent_req_post(req, ev);

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 9b9f8ef8bd5bfa9442b9ce24b9e2ae8072fdfbe2..ab8e6e7fe682fa2ca2bdb9a30bf6f1b577d1652d 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -7677,7 +7677,7 @@ static NTSTATUS smb_set_posix_lock(connection_struct *conn,
                        .offset = offset,
                        .count = count,
                };
-               status = smbd_do_unlocking(req, fsp, 1, &l, POSIX_LOCK);
+               status = smbd_do_unlocking(req, fsp, 1, &l);
                return status;
        }