From: Volker Lendecke <vl@samba.org>
Date: Thu, 30 May 2019 09:31:56 +0000 (+0200)
Subject: smbd: Slightly simplify reply_lockingX()
X-Git-Tag: ldb-2.0.5~367
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ebe2ceb3d9cd1d89cb6f5047e105b9b0dc368a5b;p=thirdparty%2Fsamba.git

smbd: Slightly simplify reply_lockingX()

Don't do an "else" after an early return

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index da47e6ed9b9..a7054c57db7 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -8402,11 +8402,11 @@ void reply_lockingX(struct smb_request *req)
 			if (num_locks == 0 && num_ulocks == 0) {
 				END_PROFILE(SMBlockingX);
 				return;
-			} else {
-				END_PROFILE(SMBlockingX);
-				reply_nterror(req, NT_STATUS_FILE_LOCK_CONFLICT);
-				return;
 			}
+
+			END_PROFILE(SMBlockingX);
+			reply_nterror(req, NT_STATUS_FILE_LOCK_CONFLICT);
+			return;
 		}
 
 		if ((fsp->sent_oplock_break == BREAK_TO_NONE_SENT) ||