diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-03 14:03:12 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-07-04 06:31:16 +0200 |
| commit | 5a1fb2eb0dc849bba5f74ef874d7629cd611929f (patch) | |
| tree | 13094eb5f609b7d9caa52a632b73ad4f182e6bc2 /source3/locking | |
| parent | 6f8fd3d5ab206838a70bdcbfc3386dc668676d70 (diff) | |
smbd: brl_lock_cancel does not need "blr" anymore
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 3 | ||||
| -rw-r--r-- | source3/locking/locking.c | 3 | ||||
| -rw-r--r-- | source3/locking/proto.h | 3 |
3 files changed, 3 insertions, 6 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); |