From 8cfb37010fdb4c8dc0fc29cc72cf21063b7d534d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 3 Jun 2019 11:34:51 +0200 Subject: [PATCH] smbd: smbd_do_locking() does not use the "type" param anymore Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/smbd/globals.h | 1 - source3/smbd/reply.c | 10 +++------- source3/smbd/smb2_lock.c | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 02f1e58b77b..10f6e60a50f 100644 --- 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 fca0706c68a..c6bee38a41b 100644 --- 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 ae845d44387..fc3ee315ecf 100644 --- 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, -- 2.47.3