sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

smbd: brl_lock_cancel does not need "blr" anymore

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2014-07-03 14:03:12 +00:00 committed by Jeremy Allison
parent 6f8fd3d5ab
commit 5a1fb2eb0d
5 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/locking/brlock.c
View File

@ -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;

3
source3/locking/locking.c
View File

@ -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);

3
source3/locking/proto.h
View File

@ -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);

9
source3/smbd/blocking.c
View File

@ -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);

6
source3/smbd/smb2_lock.c
View File

@ -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) {