vfs: Remove unused "msg_ctx" from SMB_VFS_BRL_UNLOCK_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 1d4f28d1d286b6a24fe13b0f7488b3ffd0c999a6..4b2b11a1aaa4be8fcd39ef2c0ab3f143c5bf3e79 100644 (file)
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -653,7 +653,6 @@ static NTSTATUS skel_brl_lock_windows(struct vfs_handle_struct *handle,
 }
 
 static bool skel_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                   struct messaging_context *msg_ctx,
                                    struct byte_range_lock *br_lck,
                                    const struct lock_struct *plock)
 {

diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index fd5d2296559607e670f577d8d2bf236330dfcd5a..0de01ac9d54af9f7471dfd47f18bb7db2717fa60 100644 (file)
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -824,11 +824,10 @@ static NTSTATUS skel_brl_lock_windows(struct vfs_handle_struct *handle,
 }
 
 static bool skel_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                   struct messaging_context *msg_ctx,
                                    struct byte_range_lock *br_lck,
                                    const struct lock_struct *plock)
 {
-       return SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, msg_ctx, br_lck, plock);
+       return SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, br_lck, plock);
 }
 
 static bool skel_strict_lock_check(struct vfs_handle_struct *handle,

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index f4ae10429b8fa728f861c86806a07bb9a28cca65..a7ac50f06d255313ed9a9fd7989c4018ea886609 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -268,6 +268,7 @@
 /* Version 41 - add SMB_VFS_FS_FILE_ID */
 /* Version 41 - Remove "blocking_lock" parameter from
                 SMB_VFS_BRL_LOCK_WINDOWS */
+/* Version 41 - Remove "msg_ctx" parameter from SMB_VFS_BRL_UNLOCK_WINDOWS */
 
 #define SMB_VFS_INTERFACE_VERSION 41
 
@@ -875,7 +876,6 @@ struct vfs_fn_pointers {
                                        struct lock_struct *plock);
 
        bool (*brl_unlock_windows_fn)(struct vfs_handle_struct *handle,
-                                     struct messaging_context *msg_ctx,
                                      struct byte_range_lock *br_lck,
                                      const struct lock_struct *plock);
 
@@ -1348,7 +1348,6 @@ NTSTATUS smb_vfs_call_brl_lock_windows(struct vfs_handle_struct *handle,
                                       struct byte_range_lock *br_lck,
                                       struct lock_struct *plock);
 bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                    struct messaging_context *msg_ctx,
                                     struct byte_range_lock *br_lck,
                                     const struct lock_struct *plock);
 bool smb_vfs_call_strict_lock_check(struct vfs_handle_struct *handle,
@@ -1810,7 +1809,6 @@ NTSTATUS vfs_not_implemented_brl_lock_windows(struct vfs_handle_struct *handle,
                                              struct byte_range_lock *br_lck,
                                              struct lock_struct *plock);
 bool vfs_not_implemented_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                           struct messaging_context *msg_ctx,
                                            struct byte_range_lock *br_lck,
                                            const struct lock_struct *plock);
 bool vfs_not_implemented_strict_lock_check(struct vfs_handle_struct *handle,

diff --git a/source3/include/vfs_macros.h b/source3/include/vfs_macros.h
index 2c1a9d1cd168e57b3888279ea30ff62247db4b04..fd0d9681084f3f0f058429bf9f0ffd572a8d181c 100644 (file)
--- a/source3/include/vfs_macros.h
+++ b/source3/include/vfs_macros.h
@@ -356,10 +356,10 @@
 #define SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock) \
        smb_vfs_call_brl_lock_windows((handle)->next, (br_lck), (plock))
 
-#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))
-#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_UNLOCK_WINDOWS(conn, br_lck, plock) \
+       smb_vfs_call_brl_unlock_windows((conn)->vfs_handles, (br_lck), (plock))
+#define SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, br_lck, plock) \
+       smb_vfs_call_brl_unlock_windows((handle)->next, (br_lck), (plock))
 
 #define SMB_VFS_STRICT_LOCK_CHECK(conn, fsp, plock) \
        smb_vfs_call_strict_lock_check((conn)->vfs_handles, (fsp), (plock))

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index a4e9dfc0bfe43cfab1790a5e5e4382a0297619f0..e2aa216cf57f9e1291531e8ca69e90a8185cd310 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -968,9 +968,8 @@ static void brl_delete_lock_struct(struct lock_struct *locks,
  Unlock a range of bytes - Windows semantics.
 ****************************************************************************/
 
-bool brl_unlock_windows_default(struct messaging_context *msg_ctx,
-                              struct byte_range_lock *br_lck,
-                              const struct lock_struct *plock)
+bool brl_unlock_windows_default(struct byte_range_lock *br_lck,
+                               const struct lock_struct *plock)
 {
        unsigned int i;
        struct lock_struct *locks = br_lck->lock_data;
@@ -1181,13 +1180,11 @@ static bool brl_unlock_posix(struct byte_range_lock *br_lck,
 }
 
 bool smb_vfs_call_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                    struct messaging_context *msg_ctx,
                                     struct byte_range_lock *br_lck,
                                     const struct lock_struct *plock)
 {
        VFS_FIND(brl_unlock_windows);
-       return handle->fns->brl_unlock_windows_fn(handle, msg_ctx, br_lck,
-                                                 plock);
+       return handle->fns->brl_unlock_windows_fn(handle, br_lck, plock);
 }
 
 /****************************************************************************
@@ -1214,8 +1211,8 @@ bool brl_unlock(struct messaging_context *msg_ctx,
        lock.lock_flav = lock_flav;
 
        if (lock_flav == WINDOWS_LOCK) {
-               return SMB_VFS_BRL_UNLOCK_WINDOWS(br_lck->fsp->conn, msg_ctx,
-                   br_lck, &lock);
+               return SMB_VFS_BRL_UNLOCK_WINDOWS(
+                       br_lck->fsp->conn, br_lck, &lock);
        } else {
                return brl_unlock_posix(br_lck, &lock);
        }

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 88af69f4c9144629c1b282c0650dfdb709838f8d..48b5917df5cd1f65f2e0a367b5b42b2b22951287 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -54,9 +54,8 @@ bool brl_unlock(struct messaging_context *msg_ctx,
                br_off start,
                br_off size,
                enum brl_flavour lock_flav);
-bool brl_unlock_windows_default(struct messaging_context *msg_ctx,
-                              struct byte_range_lock *br_lck,
-                              const struct lock_struct *plock);
+bool brl_unlock_windows_default(struct byte_range_lock *br_lck,
+                               const struct lock_struct *plock);
 bool brl_locktest(struct byte_range_lock *br_lck,
                  const struct lock_struct *rw_probe);
 NTSTATUS brl_lockquery(struct byte_range_lock *br_lck,

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 9359aa48607d3b422f499ca238b56aff6c8800f9..84c22bb15174ea39f6fc7e69e387a061fc2af7f3 100644 (file)
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2844,13 +2844,12 @@ static NTSTATUS vfswrap_brl_lock_windows(struct vfs_handle_struct *handle,
 }
 
 static bool vfswrap_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                      struct messaging_context *msg_ctx,
                                       struct byte_range_lock *br_lck,
                                       const struct lock_struct *plock)
 {
        SMB_ASSERT(plock->lock_flav == WINDOWS_LOCK);
 
-       return brl_unlock_windows_default(msg_ctx, br_lck, plock);
+       return brl_unlock_windows_default(br_lck, plock);
 }
 
 static bool vfswrap_strict_lock_check(struct vfs_handle_struct *handle,

diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 60802b8eb1158a27b6b0040e5b29df0c27274e47..f6e115169700ec519306af79364596291e902a57 100644 (file)
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -1903,14 +1903,12 @@ static NTSTATUS smb_full_audit_brl_lock_windows(struct vfs_handle_struct *handle
 }
 
 static bool smb_full_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                             struct messaging_context *msg_ctx,
                                              struct byte_range_lock *br_lck,
                                              const struct lock_struct *plock)
 {
        bool result;
 
-       result = SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, msg_ctx, br_lck,
-           plock);
+       result = SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, br_lck, plock);
 
        do_log(SMB_VFS_OP_BRL_UNLOCK_WINDOWS, (result == 0), handle,
               "%s:%llu-%llu:%d", fsp_str_do_log(brl_fsp(br_lck)),

diff --git a/source3/modules/vfs_not_implemented.c b/source3/modules/vfs_not_implemented.c
index 93a49722cfe3dfa62afe0cb065553778e23ab1f9..e3a39d57ca262e7e2089ee75522fde68f6fd9372 100644 (file)
--- a/source3/modules/vfs_not_implemented.c
+++ b/source3/modules/vfs_not_implemented.c
@@ -656,7 +656,6 @@ NTSTATUS vfs_not_implemented_brl_lock_windows(struct vfs_handle_struct *handle,
 }
 
 bool vfs_not_implemented_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                           struct messaging_context *msg_ctx,
                                            struct byte_range_lock *br_lck,
                                            const struct lock_struct *plock)
 {

diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index 563490bf94c025502baacd82c3b1de76869e813b..2fb847b1b34f64860850323e509c504330b8e8d1 100644 (file)
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -1628,7 +1628,6 @@ static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle
 }
 
 static bool smb_time_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
-                                             struct messaging_context *msg_ctx,
                                              struct byte_range_lock *br_lck,
                                              const struct lock_struct *plock)
 {
@@ -1637,8 +1636,7 @@ static bool smb_time_audit_brl_unlock_windows(struct vfs_handle_struct *handle,
        double timediff;
 
        clock_gettime_mono(&ts1);
-       result = SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, msg_ctx, br_lck,
-                                                plock);
+       result = SMB_VFS_NEXT_BRL_UNLOCK_WINDOWS(handle, br_lck, plock);
        clock_gettime_mono(&ts2);
        timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;