From 085c7a71fde37cb2a67a4c67673cd22f8acf0861 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 3 Jul 2014 14:10:22 +0000 Subject: [PATCH] smbd: do_lock_cancel does not need "blr" anymore Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Fri Jul 4 08:52:31 CEST 2014 on sn-devel-104 --- source3/locking/locking.c | 3 +-- source3/locking/proto.h | 3 +-- 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 402487da3f7..02c8815acf2 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 55f1dc271cd..3db9e7aa584 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 93fc708d57a..ac2facf528a 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; -- 2.11.4.GIT