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@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Wed Aug 22 00:57:31 CEST 2018 on sn-devel-144

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9ec65430852196c729b137b11b93f330e6d5040d..5b3846f8715a950f50606a86148a96ed5655edb1 100644 (file)
--- 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 295ae1ff72df2a68c6ac08a813f79ec958d570b6..3e6d1d421be265b8d164587ae0c332247ac9c0d6 100644 (file)
--- 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 7d1f0404512b2e223ee3bd4b677888b524a15356..f5afdd81abdf79a072f3f8ca34e3ed5e0fec504c 100644 (file)
--- 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)