From: Volker Lendecke <vl@samba.org>
Date: Mon, 1 Jul 2019 12:42:50 +0000 (+0200)
Subject: smbd: do_lock() never sees blocking locks anymore
X-Git-Tag: ldb-2.0.5~59
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a012a0fdfdd68640bae4a5044dbd071143fa252;p=thirdparty%2Fsamba.git

smbd: do_lock() never sees blocking locks anymore

This is now all handled in protocol-specific layers

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index cda1d9d8265..b628556d5b9 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -237,7 +237,6 @@ NTSTATUS do_lock(struct messaging_context *msg_ctx,
 		 uint64_t offset,
 		 enum brl_type lock_type,
 		 enum brl_flavour lock_flav,
-		 bool blocking_lock,
 		 struct server_id *pblocker_pid,
 		 uint64_t *psmblctx)
 {
@@ -265,12 +264,11 @@ NTSTATUS do_lock(struct messaging_context *msg_ctx,
 	/* NOTE! 0 byte long ranges ARE allowed and should be stored  */
 
 	DBG_DEBUG("lock flavour %s lock type %s start=%"PRIu64" len=%"PRIu64" "
-		  "blocking_lock=%s requested for %s file %s\n",
+		  "requested for %s file %s\n",
 		  lock_flav_name(lock_flav),
 		  lock_type_name(lock_type),
 		  offset,
 		  count,
-		  blocking_lock ? "true" : "false",
 		  fsp_fnum_dbg(fsp),
 		  fsp_str_dbg(fsp));
 
@@ -288,7 +286,7 @@ NTSTATUS do_lock(struct messaging_context *msg_ctx,
 		count,
 		lock_type,
 		lock_flav,
-		blocking_lock,
+		false,
 		&blocker_pid,
 		&blocker_smblctx);
 
diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index aee8ce32e3b..69c6889f89f 100644
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -108,7 +108,6 @@ NTSTATUS do_lock(struct messaging_context *msg_ctx,
 		 uint64_t offset,
 		 enum brl_type lock_type,
 		 enum brl_flavour lock_flav,
-		 bool blocking_lock,
 		 struct server_id *pblocker_pid,
 		 uint64_t *psmblctx);
 NTSTATUS do_unlock(struct messaging_context *msg_ctx,
diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 0952027baa4..bf87de5c5f6 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2752,7 +2752,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle,
 			off,
 			READ_LOCK,
 			POSIX_LOCK,
-			false, 	/* blocking_lock */
 			NULL,
 			NULL);
 
@@ -2771,7 +2770,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle,
 			off,
 			READ_LOCK,
 			POSIX_LOCK,
-			false,	/* blocking_lock */
 			NULL,
 			NULL);
 
@@ -2790,7 +2788,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle,
 			off,
 			READ_LOCK,
 			POSIX_LOCK,
-			false,
 			NULL,
 			NULL);
 
@@ -2809,7 +2806,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle,
 			off,
 			READ_LOCK,
 			POSIX_LOCK,
-			false,
 			NULL,
 			NULL);
 
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 30357d7ce2b..d7f071aa7be 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -68,7 +68,6 @@ NTSTATUS smbd_do_locks_try(
 			e->offset,
 			e->brltype,
 			lock_flav,
-			false,	/* blocking_lock */
 			blocking_pid,
 			blocking_smblctx);
 		if (!NT_STATUS_IS_OK(status)) {