smbd: smbd_do_locking() does not use the "type" param anymore

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 02f1e58b77bb006a86da509995bfdcdeefa33cff..10f6e60a50fd90c0ef1feeb37a4f3a825c729cd7 100644 (file)
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -117,7 +117,6 @@ void smbd_unlock_socket(struct smbXsrv_connection *xconn);
 
 NTSTATUS smbd_do_locking(struct smb_request *req,
                         files_struct *fsp,
-                        uint8_t type,
                         int32_t timeout,
                         uint16_t num_locks,
                         struct smbd_lock_element *locks,

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index fca0706c68a1c88fde99d89e381e585ff1bcd3db..c6bee38a41bf2977f6a6a8d4ea8a799878c140ee 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8075,7 +8075,6 @@ uint64_t get_lock_offset(const uint8_t *data, int data_offset,
 
 NTSTATUS smbd_do_locking(struct smb_request *req,
                         files_struct *fsp,
-                        uint8_t type,
                         int32_t timeout,
                         uint16_t num_locks,
                         struct smbd_lock_element *locks,
@@ -8205,9 +8204,8 @@ NTSTATUS smbd_do_locking(struct smb_request *req,
                return status;
        }
 
-       DBG_NOTICE("%s type=%"PRIu8" num_locks=%"PRIu16"\n",
+       DBG_NOTICE("%s num_locks=%"PRIu16"\n",
                   fsp_fnum_dbg(fsp),
-                  type,
                   num_locks);
 
        return NT_STATUS_OK;
@@ -8503,10 +8501,8 @@ void reply_lockingX(struct smb_request *req)
                return;
        }
 
-       status = smbd_do_locking(req, fsp,
-                                locktype, lock_timeout,
-                                num_locks, locks,
-                                &async);
+       status = smbd_do_locking(
+               req, fsp, lock_timeout, num_locks, locks, &async);
        TALLOC_FREE(locks);
        if (!NT_STATUS_IS_OK(status)) {
                END_PROFILE(SMBlockingX);

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index ae845d443871d0d1e73ab50aa6ebec82d594a1cc..fc3ee315ecfd424c661ec489f7feef01c16725c7 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -352,8 +352,8 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
                                           in_lock_count, locks);
                async = false;
        } else {
-               status = smbd_do_locking(smb1req, fsp,
-                                        0,
+               status = smbd_do_locking(smb1req,
+                                        fsp,
                                         timeout,
                                         in_lock_count,
                                         locks,