diff options
| -rw-r--r-- | source3/locking/brlock.c | 3 | ||||
| -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/smb2_lock.c | 6 |
5 files changed, 8 insertions, 16 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index e10f5ae255..be90b2b519 100644 --- 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 bd81197db6..402487da3f 100644 --- 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 1e559c9a03..55f1dc271c 100644 --- 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 43fc2a17bf..47ac4cc402 100644 --- 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 b11462c54f..07c23df685 100644 --- 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) { |