smbd: Remove unused blocking_lock_record* from VFS_BRL_LOCK_WINDOWS

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

diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index 5abea20dd06bf14a12c7f4147162ff8a8f567061..653c83e9fc4816f0613da5c2a28087a6b60a13b6 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -574,8 +574,7 @@ static const char *skel_connectpath(struct vfs_handle_struct *handle,
 static NTSTATUS skel_brl_lock_windows(struct vfs_handle_struct *handle,
                                      struct byte_range_lock *br_lck,
                                      struct lock_struct *plock,
-                                     bool blocking_lock,
-                                     struct blocking_lock_record *blr)
+                                     bool blocking_lock)
 {
        return NT_STATUS_NOT_IMPLEMENTED;
 }

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index f042b2aead4622d901a602b534ee79713accf113..319e9d1803594b99bfe66f34e77b2d39f6d9eb5c 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -694,11 +694,10 @@ static const char *skel_connectpath(struct vfs_handle_struct *handle,
 static NTSTATUS skel_brl_lock_windows(struct vfs_handle_struct *handle,
                                      struct byte_range_lock *br_lck,
                                      struct lock_struct *plock,
-                                     bool blocking_lock,
-                                     struct blocking_lock_record *blr)
+                                     bool blocking_lock)
 {
        return SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle,
-                                            br_lck, plock, blocking_lock, blr);
+                                            br_lck, plock, blocking_lock);
 }
 
 static bool skel_brl_unlock_windows(struct vfs_handle_struct *handle,

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 1bea0b8df0178122c3d6b9696433426955b63e2c..72fab522a2b2d229b7556071b8193297bff05ce6 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -656,8 +656,7 @@ struct vfs_fn_pointers {
        NTSTATUS (*brl_lock_windows_fn)(struct vfs_handle_struct *handle,
                                        struct byte_range_lock *br_lck,
                                        struct lock_struct *plock,
-                                       bool blocking_lock,
-                                       struct blocking_lock_record *blr);
+                                       bool blocking_lock);
 
        bool (*brl_unlock_windows_fn)(struct vfs_handle_struct *handle,
                                      struct messaging_context *msg_ctx,
@@ -1077,8 +1076,7 @@ const char *smb_vfs_call_connectpath(struct vfs_handle_struct *handle,
 NTSTATUS smb_vfs_call_brl_lock_windows(struct vfs_handle_struct *handle,
                                       struct byte_range_lock *br_lck,
                                       struct lock_struct *plock,
-                                      bool blocking_lock,
-                                      struct blocking_lock_record *blr);
+                                      bool blocking_lock);
 bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle,
                                     struct messaging_context *msg_ctx,
                                     struct byte_range_lock *br_lck,

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 0f44c62dacac578830bf4453188026b35e48e50f..775befb495ecbb46f6a6331fe0cc23246fb33b9e 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -364,10 +364,10 @@
 #define SMB_VFS_NEXT_CONNECTPATH(conn, fname) \
        smb_vfs_call_connectpath((conn)->next, (fname))
 
-#define SMB_VFS_BRL_LOCK_WINDOWS(conn, br_lck, plock, blocking_lock, blr) \
-       smb_vfs_call_brl_lock_windows((conn)->vfs_handles, (br_lck), (plock), (blocking_lock), (blr))
-#define SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock, blocking_lock, blr) \
-       smb_vfs_call_brl_lock_windows((handle)->next, (br_lck), (plock), (blocking_lock), (blr))
+#define SMB_VFS_BRL_LOCK_WINDOWS(conn, br_lck, plock, blocking_lock) \
+       smb_vfs_call_brl_lock_windows((conn)->vfs_handles, (br_lck), (plock), (blocking_lock))
+#define SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock, blocking_lock) \
+       smb_vfs_call_brl_lock_windows((handle)->next, (br_lck), (plock), (blocking_lock))
 
 #define SMB_VFS_BRL_UNLOCK_WINDOWS(conn, msg_ctx, br_lck, plock) \
        smb_vfs_call_brl_unlock_windows((conn)->vfs_handles, (msg_ctx), (br_lck), (plock))

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 58a6996c662d036f49226e248d8ccf0852e0325c..0f7c22514cb59b777be568890fe43ca572dea95c 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -933,12 +933,11 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx,
 NTSTATUS smb_vfs_call_brl_lock_windows(struct vfs_handle_struct *handle,
                                       struct byte_range_lock *br_lck,
                                       struct lock_struct *plock,
-                                      bool blocking_lock,
-                                      struct blocking_lock_record *blr)
+                                      bool blocking_lock)
 {
        VFS_FIND(brl_lock_windows);
        return handle->fns->brl_lock_windows_fn(handle, br_lck, plock,
-                                               blocking_lock, blr);
+                                               blocking_lock);
 }
 
 /****************************************************************************
@@ -982,7 +981,7 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx,
 
        if (lock_flav == WINDOWS_LOCK) {
                ret = SMB_VFS_BRL_LOCK_WINDOWS(br_lck->fsp->conn, br_lck,
-                   &lock, blocking_lock, blr);
+                                              &lock, blocking_lock);
        } else {
                ret = brl_lock_posix(msg_ctx, br_lck, &lock);
        }

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 06953573e6163d83dd7b98a20d3ae335638c7ac2..bc47e5a69c0f28768564da8d23c0df9a4eec187d 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2205,8 +2205,7 @@ static const char *vfswrap_connectpath(struct vfs_handle_struct *handle,
 static NTSTATUS vfswrap_brl_lock_windows(struct vfs_handle_struct *handle,
                                         struct byte_range_lock *br_lck,
                                         struct lock_struct *plock,
-                                        bool blocking_lock,
-                                        struct blocking_lock_record *blr)
+                                        bool blocking_lock)
 {
        SMB_ASSERT(plock->lock_flav == WINDOWS_LOCK);
 

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 99e3fcbb45448211b108b45e9bb86355673e5249..33058f4843cdf5c4294a91598e4953e2ec1e79db 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -1650,13 +1650,12 @@ static const char *smb_full_audit_connectpath(vfs_handle_struct *handle,
 static NTSTATUS smb_full_audit_brl_lock_windows(struct vfs_handle_struct *handle,
                                                struct byte_range_lock *br_lck,
                                                struct lock_struct *plock,
-                                               bool blocking_lock,
-                                               struct blocking_lock_record *blr)
+                                               bool blocking_lock)
 {
        NTSTATUS result;
 
        result = SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock,
-           blocking_lock, blr);
+                                              blocking_lock);
 
        do_log(SMB_VFS_OP_BRL_LOCK_WINDOWS, NT_STATUS_IS_OK(result), handle,
            "%s:%llu-%llu. type=%d. blocking=%d",

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index a70c8cad949e1bb689783bfa5b32f9397e840c11..f644ed1709db3e93db7bad4bb695381822d323ed 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -1543,8 +1543,7 @@ static const char *smb_time_audit_connectpath(vfs_handle_struct *handle,
 static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle,
                                                struct byte_range_lock *br_lck,
                                                struct lock_struct *plock,
-                                               bool blocking_lock,
-                                               struct blocking_lock_record *blr)
+                                               bool blocking_lock)
 {
        NTSTATUS result;
        struct timespec ts1,ts2;
@@ -1552,7 +1551,7 @@ static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle
 
        clock_gettime_mono(&ts1);
        result = SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock,
-                                              blocking_lock, blr);
+                                              blocking_lock);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;