From: Volker Lendecke <vl@samba.org>
Date: Tue, 4 Nov 2008 13:35:44 +0000 (+0100)
Subject: Slightly simplify logic in process_lockingX()
X-Git-Tag: samba-4.0.0alpha6~491
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3376e7a6a061c0d681a6a0e5c3aedfc82c36f65f;p=thirdparty%2Fsamba.git

Slightly simplify logic in process_lockingX()

The "else" is pointless here, we did a "return True" in the if branch.
---

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 414ea9fc5cc..6428c3684ba 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;
 	}