smbd: brl_lock_cancel does not need "blr" anymore

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

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index e10f5ae25530475cba6b676cc1a5c581209f590d..be90b2b519162aa1ac8a55a074461e02f501c994 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -1454,8 +1454,7 @@ bool brl_lock_cancel(struct byte_range_lock *br_lck,
                struct server_id pid,
                br_off start,
                br_off size,
-               enum brl_flavour lock_flav,
-               struct blocking_lock_record *blr)
+               enum brl_flavour lock_flav)
 {
        bool ret;
        struct lock_struct lock;

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index bd81197db61264f21cd9e54d1e59e95e3a4dd188..402487da3f702f82df90e0cd2f32cfa9b977b06c 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -381,8 +381,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
                        messaging_server_id(fsp->conn->sconn->msg_ctx),
                        offset,
                        count,
-                       lock_flav,
-                       blr);
+                       lock_flav);
 
        TALLOC_FREE(br_lck);
 

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 1e559c9a0348031549bfd82ab5ccb1833daaef12..55f1dc271cdb6f2b34890974fda89cd26a056e36 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -77,8 +77,7 @@ bool brl_lock_cancel(struct byte_range_lock *br_lck,
                struct server_id pid,
                br_off start,
                br_off size,
-               enum brl_flavour lock_flav,
-               struct blocking_lock_record *blr);
+               enum brl_flavour lock_flav);
 bool brl_lock_cancel_default(struct byte_range_lock *br_lck,
                struct lock_struct *plock);
 bool brl_mark_disconnected(struct files_struct *fsp);

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 43fc2a17bf1550206e3d1d09691b7b7677aee45f..47ac4cc4021bd5f1de6e79f43c0f7e635cbd3e89 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -725,8 +725,7 @@ void smbd_cancel_pending_lock_requests_by_fid(files_struct *fsp,
                                messaging_server_id(sconn->msg_ctx),
                                blr->offset,
                                blr->count,
-                               blr->lock_flav,
-                               blr);
+                               blr->lock_flav);
 
                /* We're closing the file fsp here, so ensure
                 * we don't have a dangling pointer. */
@@ -768,8 +767,7 @@ void remove_pending_lock_requests_by_mid_smb1(
                                        messaging_server_id(sconn->msg_ctx),
                                        blr->offset,
                                        blr->count,
-                                       blr->lock_flav,
-                                       blr);
+                                       blr->lock_flav);
                        TALLOC_FREE(br_lck);
                }
 
@@ -867,8 +865,7 @@ void process_blocking_lock_queue(struct smbd_server_connection *sconn)
                                messaging_server_id(sconn->msg_ctx),
                                blr->offset,
                                blr->count,
-                               blr->lock_flav,
-                               blr);
+                               blr->lock_flav);
                }
                TALLOC_FREE(br_lck);
 

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index b11462c54f4a458620776c4d68308bf8d9e8ab73..07c23df685d69fe2d961e695814819aacdf79741 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -664,8 +664,7 @@ static void remove_pending_lock(struct smbd_smb2_lock_state *state,
                                messaging_server_id(blr->fsp->conn->sconn->msg_ctx),
                                blr->offset,
                                blr->count,
-                               blr->lock_flav,
-                               blr);
+                               blr->lock_flav);
                TALLOC_FREE(br_lck);
        }
 }
@@ -860,8 +859,7 @@ void cancel_pending_lock_requests_by_fid_smb2(files_struct *fsp,
                                messaging_server_id(sconn->msg_ctx),
                                blr->offset,
                                blr->count,
-                               blr->lock_flav,
-                               blr);
+                               blr->lock_flav);
 
                /* Finally end the request. */
                if (close_type == SHUTDOWN_CLOSE) {