From patchwork Wed Mar 15 13:05:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volker Lendecke X-Patchwork-Id: 1757345 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=s4ykIrxG; 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 4Pc9cg6Dx5z247H for ; Thu, 16 Mar 2023 00:05:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231879AbjCONFw (ORCPT ); Wed, 15 Mar 2023 09:05:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229666AbjCONFu (ORCPT ); Wed, 15 Mar 2023 09:05:50 -0400 Received: from hr2.samba.org (hr2.samba.org [IPv6:2a01:4f8:192:486::2:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FE42570A9 for ; Wed, 15 Mar 2023 06:05:46 -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=9x4Bm9H1uhZfjy1inAXt6rhGoE94LlElYSHSInWdjGU=; b=s4ykIrxG67TJEdVsfXuFCwedGd viDlOovbA1rLaL62ggcTBDQc9XcClXs3a77a1qkMJudc5N3Iy+22Cv/CMIkfmU+mmYCro6fOGrfxg dj/bJQsXdmRTQiZpmHhXhbZuzKVYgxreqpfe5/s8EonmRwUrI5nGgvcLUsv/H0osjQEzqy3wE0J9+ 4wGbprPhLDLzwh4c7Zj2PLK70ji61ndAftMDyWuEbXRDz6cqV1MfHmCMQiPyJTnfDdEWETFWNIYMd w2SMQFrXiPff0+omAuOQraWpE44+AHcyWStSL3EyaHmyNLLVGYPNZ5/yBUeKjSGchniYg21Obf0vd RuJh1ZEI7HvwCQWLY8IL58obM3LFJnAkY20OPZlHMFJBpR1xamIvQDrXlR4zUCs7BDL/yPHobxK0N ZuZkUw0Qo0KNtU2WMNHUniA56Aiwe8KrKyxzt7dAgtVcMxzUBG4B1JhlNHxn0YnDlv+w/KjMBjXVW iOHXzZQh8mZGjZ13Cs9Ay+CW; Received: from [2a01:4f8:252:410e::177:224] (port=40716 helo=atb-devel-224..) by hr2.samba.org with esmtp (Exim) id 1pcQp6-003KNd-Gg; Wed, 15 Mar 2023 13:05:44 +0000 From: Volker Lendecke To: linux-cifs@vger.kernel.org Cc: Volker Lendecke Subject: [PATCH 03/10] cifs: Slightly simplify cifs_readdir() Date: Wed, 15 Mar 2023 13:05:24 +0000 Message-Id: <468ae3a579bb44fca13113680fecfd550e36b055.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 "else" not needed, we do a "goto" in the if-branch. This makes the following condition a bit easier to read for me. Signed-off-by: Volker Lendecke --- fs/cifs/readdir.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c index ef638086d734..7dfa33b6954f 100644 --- a/fs/cifs/readdir.c +++ b/fs/cifs/readdir.c @@ -1165,7 +1165,8 @@ int cifs_readdir(struct file *file, struct dir_context *ctx) if (rc) { cifs_dbg(FYI, "fce error %d\n", rc); goto rddir2_exit; - } else if (current_entry != NULL) { + } + if (current_entry != NULL) { cifs_dbg(FYI, "entry %lld found\n", ctx->pos); } else { if (cfid) {