From dec08b8041c88211efa9efd190c3bb6b6946f599 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 1 Jun 2012 15:52:14 +0200 Subject: s3: Simplify get_delete_on_close_token more All remaining callers actually want the token Signed-off-by: Stefan Metzmacher --- source3/locking/locking.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source3') diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 0003f94d18..5da7595737 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -1081,12 +1081,8 @@ bool get_delete_on_close_token(struct share_mode_lock *lck, if (dt == NULL) { return false; } - if (pp_nt_tok) { - *pp_nt_tok = dt->delete_nt_token; - } - if (pp_tok) { - *pp_tok = dt->delete_token; - } + *pp_nt_tok = dt->delete_nt_token; + *pp_tok = dt->delete_token; return true; } -- cgit