diff options
author | Volker Lendecke <vl@samba.org> | 2014-07-03 14:10:22 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2014-07-04 08:52:31 +0200 |
commit | 085c7a71fde37cb2a67a4c67673cd22f8acf0861 (patch) | |
tree | 8bb39b72b12df73c25d1f496684019d0131b6ed6 /source3 | |
parent | 5a1fb2eb0dc849bba5f74ef874d7629cd611929f (diff) | |
download | samba-085c7a71fde37cb2a67a4c67673cd22f8acf0861.tar.gz samba-085c7a71fde37cb2a67a4c67673cd22f8acf0861.tar.xz samba-085c7a71fde37cb2a67a4c67673cd22f8acf0861.zip |
smbd: do_lock_cancel does not need "blr" anymore
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jul 4 08:52:31 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r-- | source3/locking/locking.c | 3 | ||||
-rw-r--r-- | source3/locking/proto.h | 3 | ||||
-rw-r--r-- | source3/smbd/reply.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 402487da3f..02c8815acf 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -352,8 +352,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp, uint64 smblctx, uint64_t count, uint64_t offset, - enum brl_flavour lock_flav, - struct blocking_lock_record *blr) + enum brl_flavour lock_flav) { bool ok = False; struct byte_range_lock *br_lck = NULL; diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 55f1dc271c..3db9e7aa58 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -140,8 +140,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp, uint64 smblctx, uint64_t count, uint64_t offset, - enum brl_flavour lock_flav, - struct blocking_lock_record *blr); + enum brl_flavour lock_flav); void locking_close_file(struct messaging_context *msg_ctx, files_struct *fsp, enum file_close_type close_type); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 93fc708d57..ac2facf528 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -7773,8 +7773,7 @@ NTSTATUS smbd_do_locking(struct smb_request *req, e->smblctx, e->count, e->offset, - WINDOWS_LOCK, - blr); + WINDOWS_LOCK); } else { bool blocking_lock = timeout ? true : false; bool defer_lock = false; |