diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-03 14:05:03 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-07-04 06:31:16 +0200 |
| commit | c886e66232a264fd41db507f853c74e1d82858be (patch) | |
| tree | 959a820efd0745e6c9eafc615d6ec76079a74662 | |
| parent | b08fe2d98d65c4c389ac8771c91d907958490f4f (diff) | |
| download | samba-c886e66232a264fd41db507f853c74e1d82858be.tar.gz samba-c886e66232a264fd41db507f853c74e1d82858be.tar.xz samba-c886e66232a264fd41db507f853c74e1d82858be.zip | |
smbd: brl_lock does not need "blr" anymore
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -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 | 6 | ||||
| -rw-r--r-- | source3/smbd/smb2_lock.c | 3 |
5 files changed, 6 insertions, 12 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 0f7c22514c..1527a14071 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -953,8 +953,7 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx, enum brl_type lock_type, enum brl_flavour lock_flav, bool blocking_lock, - uint64_t *psmblctx, - struct blocking_lock_record *blr) + uint64_t *psmblctx) { NTSTATUS ret; struct lock_struct lock; diff --git a/source3/locking/locking.c b/source3/locking/locking.c index b3f65ee6a4..d82c5b3092 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -287,8 +287,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx, lock_type, lock_flav, blocking_lock, - psmblctx, - blr); + psmblctx); DEBUG(10, ("do_lock: returning status=%s\n", nt_errstr(*perr))); diff --git a/source3/locking/proto.h b/source3/locking/proto.h index dc115e1d96..dc880d1415 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -47,8 +47,7 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx, enum brl_type lock_type, enum brl_flavour lock_flav, bool blocking_lock, - uint64_t *psmblctx, - struct blocking_lock_record *blr); + uint64_t *psmblctx); bool brl_unlock(struct messaging_context *msg_ctx, struct byte_range_lock *br_lck, uint64_t smblctx, diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 1088a593c8..67d12e7555 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -227,8 +227,7 @@ bool push_blocking_lock_request( struct byte_range_lock *br_lck, lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK, blr->lock_flav, True, - NULL, - blr); + NULL); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("push_blocking_lock_request: failed to add PENDING_LOCK record.\n")); @@ -518,8 +517,7 @@ static bool process_lockingX(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 " diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c index 9aadd00e89..f0dadfd7e4 100644 --- a/source3/smbd/smb2_lock.c +++ b/source3/smbd/smb2_lock.c @@ -617,8 +617,7 @@ bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck, lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK, blr->lock_flav, true, - NULL, - blr); + NULL); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("push_blocking_lock_request_smb2: " |