sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

smbd: do_lock_cancel does not need "blr" anymore

Browse Source 
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
This commit is contained in:
Volker Lendecke 2014-07-03 14:10:22 +00:00 committed by Jeremy Allison
parent 5a1fb2eb0d
commit 085c7a71fd
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/locking/locking.c
View File

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

3
source3/locking/proto.h
View File

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

3
source3/smbd/reply.c
View File

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