From patchwork Wed Mar 15 13:05:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volker Lendecke X-Patchwork-Id: 1757349 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-cifs-owner@vger.kernel.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (3072-bit key; secure) header.d=samba.org header.i=@samba.org header.a=rsa-sha256 header.s=42 header.b=fFWGdNCP; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by legolas.ozlabs.org (Postfix) with ESMTP id 4Pc9cj5sTwz247H for ; Thu, 16 Mar 2023 00:05:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231847AbjCONFz (ORCPT ); Wed, 15 Mar 2023 09:05:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232056AbjCONFv (ORCPT ); Wed, 15 Mar 2023 09:05:51 -0400 Received: from hr2.samba.org (hr2.samba.org [IPv6:2a01:4f8:192:486::2:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 88736515E5 for ; Wed, 15 Mar 2023 06:05:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=samba.org; s=42; h=Message-Id:Date:Cc:To:From; bh=UlnvtVTzFExutVsAMVpB1aL+jRYagjdQDq/OUASBgP0=; b=fFWGdNCPJOc3oobed79IcDo7VA yQXFV8lojdkZ2I9AovKlEmXcNuoKGMF8L6yk0E9DrzBVsHGFlySXt9KCNFqbYhSNMM0dPD7JB7nyF xlkFyWvSKH0S6jo2ASC4LVQusp0pmLAm55WAvatLhkCApXbJO7PCoQPusPKp6xNtFUdcaCJx39ql2 eTmRrNgWrDABJzVmnz1dUEhLeaw+e5RUAfCBjGlSEFukjjHTjfmwsHjvROPautlFFGhr6uadUckHz 8k4TJskPfyWSClTr30BhIvZzTNcvgFcCEz7863JbpAYFAR0rCZCv2PfsgJYXBPTgxGWpFSU5gHSJ1 5EbfwZqbHozMsJ4t2T20Qwqx65nE5PxX9cYxodI8Al+Jefpmetcn2qN8XenaIcB57dbJ63Fc4QnUj Itt7arcDHvl5XulqMFGA5tFTNbC0owf86y3O4HRsplvT34RXFVieNVzToo1hkldQBh8IQzzRUK5Ka y2L9uyobwasg6iHGOn3xIPLI; Received: from [2a01:4f8:252:410e::177:224] (port=40716 helo=atb-devel-224..) by hr2.samba.org with esmtp (Exim) id 1pcQp7-003KNd-EC; Wed, 15 Mar 2023 13:05:45 +0000 From: Volker Lendecke To: linux-cifs@vger.kernel.org Cc: Volker Lendecke Subject: [PATCH 08/10] cifs: Avoid two "else" branches Date: Wed, 15 Mar 2023 13:05:29 +0000 Message-Id: <89a7deedf5ab90f9247f0a3a26ac3ed9efb2c588.1678885349.git.vl@samba.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org We goto out of the if-branches, this makes the flow easier to read Signed-off-by: Volker Lendecke --- fs/cifs/smb2pdu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index dede2d422c1f..14b909b2348b 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c @@ -2997,11 +2997,13 @@ SMB2_open(const unsigned int xid, struct cifs_open_parms *oparms, __le16 *path, tcon->need_reconnect = true; } goto creat_exit; - } else if (rsp == NULL) /* unlikely to happen, but safer to check */ + } + + if (rsp == NULL) /* unlikely to happen, but safer to check */ goto creat_exit; - else - trace_smb3_open_done(xid, rsp->PersistentFileId, tcon->tid, ses->Suid, - oparms->create_options, oparms->desired_access); + + trace_smb3_open_done(xid, rsp->PersistentFileId, tcon->tid, ses->Suid, + oparms->create_options, oparms->desired_access); atomic_inc(&tcon->num_remote_opens); oparms->fid->persistent_fid = rsp->PersistentFileId;