smbd: Remove unused blocking_lock_record* from VFS_BRL_CANCEL_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 653c83e9fc4816f0613da5c2a28087a6b60a13b6..724dd7b210135c77482a6fc08def35989c67ead6 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -590,8 +590,7 @@ static bool skel_brl_unlock_windows(struct vfs_handle_struct *handle,
 
 static bool skel_brl_cancel_windows(struct vfs_handle_struct *handle,
                                    struct byte_range_lock *br_lck,
-                                   struct lock_struct *plock,
-                                   struct blocking_lock_record *blr)
+                                   struct lock_struct *plock)
 {
        errno = ENOSYS;
        return false;

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 319e9d1803594b99bfe66f34e77b2d39f6d9eb5c..329b016d232ab97fa1d95e8d62ff9e32559ed7d6 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -710,10 +710,9 @@ static bool skel_brl_unlock_windows(struct vfs_handle_struct *handle,
 
 static bool skel_brl_cancel_windows(struct vfs_handle_struct *handle,
                                    struct byte_range_lock *br_lck,
-                                   struct lock_struct *plock,
-                                   struct blocking_lock_record *blr)
+                                   struct lock_struct *plock)
 {
-       return SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock, blr);
+       return SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock);
 }
 
 static bool skel_strict_lock(struct vfs_handle_struct *handle,

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 72fab522a2b2d229b7556071b8193297bff05ce6..474b1e3a782b6870fa0a04c152f9e253c77bb538 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -665,8 +665,7 @@ struct vfs_fn_pointers {
 
        bool (*brl_cancel_windows_fn)(struct vfs_handle_struct *handle,
                                      struct byte_range_lock *br_lck,
-                                     struct lock_struct *plock,
-                                     struct blocking_lock_record *blr);
+                                     struct lock_struct *plock);
 
        bool (*strict_lock_fn)(struct vfs_handle_struct *handle,
                               struct files_struct *fsp,
@@ -1083,8 +1082,7 @@ bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle,
                                     const struct lock_struct *plock);
 bool smb_vfs_call_brl_cancel_windows(struct vfs_handle_struct *handle,
                                     struct byte_range_lock *br_lck,
-                                    struct lock_struct *plock,
-                                    struct blocking_lock_record *blr);
+                                    struct lock_struct *plock);
 bool smb_vfs_call_strict_lock(struct vfs_handle_struct *handle,
                              struct files_struct *fsp,
                              struct lock_struct *plock);

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 775befb495ecbb46f6a6331fe0cc23246fb33b9e..de9f55fda88adf1f1eec4a4fe8dbc9c5472a9d7f 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -374,10 +374,10 @@
 #define SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, msg_ctx, br_lck, plock) \
        smb_vfs_call_brl_unlock_windows((handle)->next, (msg_ctx), (br_lck), (plock))
 
-#define SMB_VFS_BRL_CANCEL_WINDOWS(conn, br_lck, plock, blr) \
-       smb_vfs_call_brl_cancel_windows((conn)->vfs_handles, (br_lck), (plock), (blr))
-#define SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock, blr) \
-       smb_vfs_call_brl_cancel_windows((handle)->next, (br_lck), (plock), (blr))
+#define SMB_VFS_BRL_CANCEL_WINDOWS(conn, br_lck, plock) \
+       smb_vfs_call_brl_cancel_windows((conn)->vfs_handles, (br_lck), (plock))
+#define SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock) \
+       smb_vfs_call_brl_cancel_windows((handle)->next, (br_lck), (plock))
 
 #define SMB_VFS_STRICT_LOCK(conn, fsp, plock) \
        smb_vfs_call_strict_lock((conn)->vfs_handles, (fsp), (plock))

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index 1527a14071f1a431ba1df4a3297b841c681edc4a..e10f5ae25530475cba6b676cc1a5c581209f590d 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1440,11 +1440,10 @@ NTSTATUS brl_lockquery(struct byte_range_lock *br_lck,
 
 bool smb_vfs_call_brl_cancel_windows(struct vfs_handle_struct *handle,
                                     struct byte_range_lock *br_lck,
-                                    struct lock_struct *plock,
-                                    struct blocking_lock_record *blr)
+                                    struct lock_struct *plock)
 {
        VFS_FIND(brl_cancel_windows);
-       return handle->fns->brl_cancel_windows_fn(handle, br_lck, plock, blr);
+       return handle->fns->brl_cancel_windows_fn(handle, br_lck, plock);
 }
 
 /****************************************************************************
@@ -1472,7 +1471,7 @@ bool brl_lock_cancel(struct byte_range_lock *br_lck,
 
        if (lock_flav == WINDOWS_LOCK) {
                ret = SMB_VFS_BRL_CANCEL_WINDOWS(br_lck->fsp->conn, br_lck,
-                   &lock, blr);
+                                                &lock);
        } else {
                ret = brl_lock_cancel_default(br_lck, &lock);
        }

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index bc47e5a69c0f28768564da8d23c0df9a4eec187d..78c249d79649a9e8eca6ca02895fa6e8a8e14287 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2225,8 +2225,7 @@ static bool vfswrap_brl_unlock_windows(struct vfs_handle_struct *handle,
 
 static bool vfswrap_brl_cancel_windows(struct vfs_handle_struct *handle,
                                       struct byte_range_lock *br_lck,
-                                      struct lock_struct *plock,
-                                      struct blocking_lock_record *blr)
+                                      struct lock_struct *plock)
 {
        SMB_ASSERT(plock->lock_flav == WINDOWS_LOCK);
 

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 33058f4843cdf5c4294a91598e4953e2ec1e79db..262b24114769b178ef55c402a628a04713930a56 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -1685,12 +1685,11 @@ static bool smb_full_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
 
 static bool smb_full_audit_brl_cancel_windows(struct vfs_handle_struct *handle,
                                              struct byte_range_lock *br_lck,
-                                             struct lock_struct *plock,
-                                             struct blocking_lock_record *blr)
+                                             struct lock_struct *plock)
 {
        bool result;
 
-       result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock, blr);
+       result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock);
 
        do_log(SMB_VFS_OP_BRL_CANCEL_WINDOWS, (result == 0), handle,
               "%s:%llu-%llu:%d", fsp_str_do_log(brl_fsp(br_lck)),

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index f644ed1709db3e93db7bad4bb695381822d323ed..3a45ecdb8878268b8259f9a0c4e46255f7c18da5 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -1588,15 +1588,14 @@ static bool smb_time_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
 
 static bool smb_time_audit_brl_cancel_windows(struct vfs_handle_struct *handle,
                                              struct byte_range_lock *br_lck,
-                                             struct lock_struct *plock,
-                                             struct blocking_lock_record *blr)
+                                             struct lock_struct *plock)
 {
        bool result;
        struct timespec ts1,ts2;
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock, blr);
+       result = SMB_VFS_NEXT_BRL_CANCEL_WINDOWS(handle, br_lck, plock);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;