diff options
| -rw-r--r-- | source3/locking/locking.c | 3 | ||||
| -rw-r--r-- | source3/locking/proto.h | 3 | ||||
| -rw-r--r-- | source3/smbd/blocking.c | 9 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 5 | ||||
| -rw-r--r-- | source3/smbd/smb2_lock.c | 3 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 3 |
6 files changed, 8 insertions, 18 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index d82c5b3092a..bd81197db61 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -243,8 +243,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx, enum brl_flavour lock_flav, bool blocking_lock, NTSTATUS *perr, - uint64_t *psmblctx, - struct blocking_lock_record *blr) + uint64_t *psmblctx) { struct byte_range_lock *br_lck = NULL; diff --git a/source3/locking/proto.h b/source3/locking/proto.h index dc880d14157..1e559c9a034 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -130,8 +130,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx, enum brl_flavour lock_flav, bool blocking_lock, NTSTATUS *perr, - uint64_t *psmblctx, - struct blocking_lock_record *blr); + uint64_t *psmblctx); NTSTATUS do_unlock(struct messaging_context *msg_ctx, files_struct *fsp, uint64_t smblctx, diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 67d12e7555d..43fc2a17bf1 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -495,8 +495,7 @@ static bool process_lockingX(struct blocking_lock_record *blr) WINDOWS_LOCK, True, &status, - &blr->blocking_smblctx, - blr); + &blr->blocking_smblctx); if (ERROR_WAS_LOCK_DENIED(status) && !lock_timeout) { /* @@ -596,8 +595,7 @@ static bool process_trans2(struct blocking_lock_record *blr) blr->lock_flav, True, &status, - &blr->blocking_smblctx, - blr); + &blr->blocking_smblctx); if (ERROR_WAS_LOCK_DENIED(status) && !lock_timeout) { /* * If we didn't timeout, but still need to wait, @@ -617,8 +615,7 @@ static bool process_trans2(struct blocking_lock_record *blr) PENDING_WRITE_LOCK, blr->lock_flav, true, /* Blocking lock. */ - NULL, - blr); + NULL); if (!NT_STATUS_IS_OK(status1)) { DEBUG(0,("failed to add PENDING_LOCK record.\n")); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 52eb33ee5ad..93fc708d57a 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3510,7 +3510,6 @@ void reply_lockread(struct smb_request *req) WINDOWS_LOCK, False, /* Non-blocking lock. */ &status, - NULL, NULL); TALLOC_FREE(br_lck); @@ -5299,7 +5298,6 @@ void reply_lock(struct smb_request *req) WINDOWS_LOCK, False, /* Non-blocking lock. */ &status, - NULL, NULL); TALLOC_FREE(br_lck); @@ -7792,8 +7790,7 @@ NTSTATUS smbd_do_locking(struct smb_request *req, WINDOWS_LOCK, blocking_lock, &status, - &block_smblctx, - NULL); + &block_smblctx); if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) { /* Windows internal resolution for blocking locks seems diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index f0dadfd7e45..b11462c54f4 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -712,8 +712,7 @@ static void reprocess_blocked_smb2_lock(struct smbd_smb2_request *smb2req, WINDOWS_LOCK, true, &status, - &blr->blocking_smblctx, - blr); + &blr->blocking_smblctx); TALLOC_FREE(br_lck); diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index aeada68651d..a95edf80807 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -6698,8 +6698,7 @@ static NTSTATUS smb_set_posix_lock(connection_struct *conn, POSIX_LOCK, blocking_lock, &status, - &block_smblctx, - NULL); + &block_smblctx); if (br_lck && blocking_lock && ERROR_WAS_LOCK_DENIED(status)) { /* |