From 3376e7a6a061c0d681a6a0e5c3aedfc82c36f65f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 4 Nov 2008 14:35:44 +0100 Subject: Slightly simplify logic in process_lockingX() The "else" is pointless here, we did a "return True" in the if branch. --- source3/smbd/blocking.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 414ea9fc5c..6428c3684b 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -470,14 +470,15 @@ static bool process_lockingX(blocking_lock_record *blr) reply_lockingX_success(blr); return True; - } else if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) && - !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) { - /* - * We have other than a "can't get lock" - * error. Free any locks we had and return an error. - * Return True so we get dequeued. - */ + } + if (!NT_STATUS_EQUAL(status,NT_STATUS_LOCK_NOT_GRANTED) && + !NT_STATUS_EQUAL(status,NT_STATUS_FILE_LOCK_CONFLICT)) { + /* + * We have other than a "can't get lock" + * error. Free any locks we had and return an error. + * Return True so we get dequeued. + */ blocking_lock_reply_error(blr, status); return True; } -- cgit