[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  7460d9b smbd: Remove koplocks->contend_level2 callbacks
      from  ec3c37e torture: Demonstrate the invalid lock order panic

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7460d9b97e11b710ce1ce95777f30e940629050b
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jul 26 13:08:06 2018 +0200

    smbd: Remove koplocks->contend_level2 callbacks
    
    This was only implemented by onefs in this way. If we get around to use
    for example fanotify or something similar, we can either re-add them or
    do it in a different way. For now, simplify the code.
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Wed Aug 22 00:57:31 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/include/smb.h       |  4 ----
 source3/smbd/oplock.c       | 20 +-------------------
 source3/smbd/oplock_linux.c |  2 --
 3 files changed, 1 insertion(+), 25 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9ec6543..5b3846f 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -700,10 +700,6 @@ struct kernel_oplocks_ops {
 			   files_struct *fsp, int oplock_type);
 	void (*release_oplock)(struct kernel_oplocks *ctx,
 			       files_struct *fsp, int oplock_type);
-	void (*contend_level2_oplocks_begin)(files_struct *fsp,
-					     enum level2_contention_type type);
-	void (*contend_level2_oplocks_end)(files_struct *fsp,
-					   enum level2_contention_type type);
 };
 
 #include "smb_macros.h"
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 295ae1f..3e6d1d4 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -1298,31 +1298,13 @@ done:
 void smbd_contend_level2_oplocks_begin(files_struct *fsp,
 				  enum level2_contention_type type)
 {
-	struct smbd_server_connection *sconn = fsp->conn->sconn;
-	struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
-	bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
-			(koplocks != NULL);
-
-	if (use_kernel && koplocks->ops->contend_level2_oplocks_begin) {
-		koplocks->ops->contend_level2_oplocks_begin(fsp, type);
-		return;
-	}
-
 	contend_level2_oplocks_begin_default(fsp, type);
 }
 
 void smbd_contend_level2_oplocks_end(files_struct *fsp,
 				enum level2_contention_type type)
 {
-	struct smbd_server_connection *sconn = fsp->conn->sconn;
-	struct kernel_oplocks *koplocks = sconn->oplocks.kernel_ops;
-	bool use_kernel = lp_kernel_oplocks(SNUM(fsp->conn)) &&
-			(koplocks != NULL);
-
-	/* Only kernel oplocks implement this so far */
-	if (use_kernel && koplocks->ops->contend_level2_oplocks_end) {
-		koplocks->ops->contend_level2_oplocks_end(fsp, type);
-	}
+	return;
 }
 
 /****************************************************************************
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index 7d1f040..f5afdd8 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -220,8 +220,6 @@ static bool linux_oplocks_available(void)
 static const struct kernel_oplocks_ops linux_koplocks = {
 	.set_oplock			= linux_set_kernel_oplock,
 	.release_oplock			= linux_release_kernel_oplock,
-	.contend_level2_oplocks_begin	= NULL,
-	.contend_level2_oplocks_end	= NULL,
 };
 
 struct kernel_oplocks *linux_init_kernel_oplocks(struct smbd_server_connection *sconn)


-- 
Samba Shared Repository