]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Slightly simplify reply_lockingX()
authorVolker Lendecke <vl@samba.org>
Thu, 30 May 2019 09:31:56 +0000 (11:31 +0200)
committerJeremy Allison <jra@samba.org>
Tue, 18 Jun 2019 12:54:00 +0000 (12:54 +0000)
Don't do an "else" after an early return

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/smbd/reply.c

index da47e6ed9b9cc39b053088bf3ad7cf1f7a109c38..a7054c57db73d2d689a5a549cd30aacb12a68c45 100644 (file)
@@ -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) ||