Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp101475pxb; Tue, 17 Nov 2020 22:28:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbb8zkmxmpDslfwScllt1AP1xrWLBFwrvnQThrZo/TJ6RNrmNhKt6Q/UzRmodTjRBD6slz X-Received: by 2002:a17:906:2818:: with SMTP id r24mr23622099ejc.100.1605680892312; Tue, 17 Nov 2020 22:28:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605680892; cv=none; d=google.com; s=arc-20160816; b=0mVPy/RhaDKUqi+o9DFEX+rqR6001PtWSwezo7gCfO8AKmz2DqwLGquhWfuuL/8lbC NAUK+U6ymsmjkVVV9OJWoir+rqDzqAx0tSfu2+ijfnDT6SyGjIggvgIQsK84Ivy2h+NV sTnPdnKx2w+41lHd1t4R5yHIdYS9Ippsd935t85VT7tKZkxCRqiOPzPNWZ+obJpNfxSK 7nSiTySeSOsEGp5qUjK9vtNVpYAaAHnOIOlDnMhDpEPZdc4n5sIHK0fzmrbC9Hgr94JA YuwC8to0C2r8PrS5d5hG4Vmc+TH5JY0J4kRqD3U0yyDzupunGb9x1TmjJ3/RFBSNCBu8 UdHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=gSMmH39bSscBO+8TGu+F9q+yi66EsYPiqVxCHjjZR3w=; b=fgZL9pzsvh/e7bMsVbfCxgiZCwoYz3icA8e1BzTKYABADJBq10SAKnCUIqE4UV5O+3 Z1VHvwDJZ5/CBIgqHuaixGlxF1n0Fs85cuTGk5JJqVLb6o/wPJoXOVpb7xCUBHTH7ZG4 Rin/iFw+vT49pHSrDDui8+r7QBdbl4kgHmUIQONGE1y16c+mZUCfN7Ob0/j7j9ORjw4z ZjCJs+KLVpyxMUV3YGRlkqE61cy8hPUGEwKlDnlB5caIKRvktw/C4ywjIV6MwyxXLtXO X/85LBjPvjeNStEZAfO1WOncHGWuP6Wiib0qbMPuGHShx7TqrrxD98uscZekeP4B+9W0 1T+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V58yRoep; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c17si14664382ejx.185.2020.11.17.22.27.48; Tue, 17 Nov 2020 22:28:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V58yRoep; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726404AbgKRG1Y (ORCPT + 99 others); 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