From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BDDE1C6369E for ; Wed, 18 Nov 2020 06:28:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 538DA2468F for ; Wed, 18 Nov 2020 06:28:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="V58yRoep" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726466AbgKRG1Y (ORCPT ); Wed, 18 Nov 2020 01:27:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:45144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726361AbgKRG1Y (ORCPT ); Wed, 18 Nov 2020 01:27:24 -0500 Received: from sol.localdomain (172-10-235-113.lightspeed.sntcca.sbcglobal.net [172.10.235.113]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 967CC24655; Wed, 18 Nov 2020 06:27:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605680843; bh=RpCSS3y/duXfmLEcUn3G8/pHSXmT8ukKU/5AG+m0bT8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=V58yRoepyagZTKlr+aW6gb29AshdnBnmgDiYwKqMm3jlLRYkgNPd33jvY3404zhqF f0Vq1eeZw/pwKC17YrReXC+eB7OqJ3I2z/UF/rbyQKIjkyufDOUzj36PJr33VOANJ1 46Slhm5EzAs0u5/ypJRRtVFkLqUibL9cremOd1dY= Date: Tue, 17 Nov 2020 22:27:20 -0800 From: Eric Biggers To: Daniel Rosenberg Cc: "Theodore Y . Ts'o" , Jaegeuk Kim , Andreas Dilger , Chao Yu , Alexander Viro , Richard Weinberger , linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mtd@lists.infradead.org, Gabriel Krisman Bertazi , kernel-team@android.com Subject: Re: [PATCH v2 3/3] f2fs: Handle casefolding with Encryption Message-ID: References: <20201117040315.28548-1-drosen@google.com> <20201117040315.28548-4-drosen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org On Tue, Nov 17, 2020 at 10:22:28PM -0800, Daniel Rosenberg wrote: > > > @@ -273,10 +308,14 @@ struct f2fs_dir_entry *f2fs_find_target_dentry(const struct f2fs_dentry_ptr *d, > > > continue; > > > } > > > > > > - if (de->hash_code == fname->hash && > > > - f2fs_match_name(d->inode, fname, d->filename[bit_pos], > > > - le16_to_cpu(de->name_len))) > > > - goto found; > > > + if (de->hash_code == fname->hash) { > > > + res = f2fs_match_name(d->inode, fname, d->filename[bit_pos], > > > + le16_to_cpu(de->name_len)); > > > + if (res < 0) > > > + return ERR_PTR(res); > > > + else if (res) > > > + goto found; > > > + } > > > > Overly long line here. Also 'else if' is unnecessary, just use 'if'. > > > > - Eric > The 0 case is important, since that reflects that the name was not found. I meant doing the following: if (res < 0) return ERR_PTR(res); if (res) goto found; It doesn't really matter, but usually kernel code doesn't use 'else' after an early return. - Eric