From e41c7a77b5fd10a768589b684219fd62be031db1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 21 Apr 2015 11:38:32 +0200 Subject: [PATCH] smbd: Use reset_delete_on_close_lck directly BUG: https://bugzilla.samba.org/show_bug.cgi?id=11257 Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison (cherry picked from commit 1f3735a28c3e6cbe2ca6c8e3bf312b3ea8c1754e) --- source3/locking/locking.c | 4 +--- source3/smbd/close.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source3/locking/locking.c b/source3/locking/locking.c index cff9025e22d..e9c303907b8 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -1174,9 +1174,7 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close, nt_tok, tok); } else { - set_delete_on_close_lck(fsp, lck, false, - NULL, - NULL); + reset_delete_on_close_lck(fsp, lck); } if (fsp->is_directory) { diff --git a/source3/smbd/close.c b/source3/smbd/close.c index fc1d3802fd8..3f02779ebc2 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -461,7 +461,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp, */ fsp->delete_on_close = false; - set_delete_on_close_lck(fsp, lck, false, NULL, NULL); + reset_delete_on_close_lck(fsp, lck); done: -- 2.11.4.GIT