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=-6.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=no 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 BB0EEC43468 for ; Mon, 21 Sep 2020 01:11:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7FAE4207EA for ; Mon, 21 Sep 2020 01:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726461AbgIUBLF (ORCPT ); Sun, 20 Sep 2020 21:11:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59432 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726253AbgIUBLE (ORCPT ); Sun, 20 Sep 2020 21:11:04 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98606C061755; Sun, 20 Sep 2020 18:11:04 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id CA5D628BA5A From: Gabriel Krisman Bertazi To: Daniel Rosenberg Cc: "Theodore Ts'o" , linux-ext4@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net, Eric Biggers , linux-fscrypt@vger.kernel.org, Alexander Viro , Andreas Dilger , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, kernel-team@android.com, Eric Biggers Subject: Re: [PATCH v12 4/4] ext4: Use generic casefolding support Organization: Collabora References: <20200708091237.3922153-1-drosen@google.com> <20200708091237.3922153-5-drosen@google.com> Date: Sun, 20 Sep 2020 21:10:57 -0400 In-Reply-To: <20200708091237.3922153-5-drosen@google.com> (Daniel Rosenberg's message of "Wed, 8 Jul 2020 02:12:37 -0700") Message-ID: <87lfh4djdq.fsf@collabora.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Daniel Rosenberg writes: > This switches ext4 over to the generic support provided in > the previous patch. > > Since casefolded dentries behave the same in ext4 and f2fs, we decrease > the maintenance burden by unifying them, and any optimizations will > immediately apply to both. > > Signed-off-by: Daniel Rosenberg > Reviewed-by: Eric Biggers > > #ifdef CONFIG_UNICODE > - if (EXT4_SB(parent->i_sb)->s_encoding && IS_CASEFOLDED(parent)) { > + if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent)) { > if (fname->cf_name.name) { > struct qstr cf = {.name = fname->cf_name.name, > .len = fname->cf_name.len}; > @@ -2171,9 +2171,6 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry, > struct buffer_head *bh = NULL; > struct ext4_dir_entry_2 *de; > struct super_block *sb; > -#ifdef CONFIG_UNICODE > - struct ext4_sb_info *sbi; > -#endif > struct ext4_filename fname; > int retval; > int dx_fallback=0; > @@ -2190,9 +2187,8 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry, > return -EINVAL; > > #ifdef CONFIG_UNICODE > - sbi = EXT4_SB(sb); > - if (ext4_has_strict_mode(sbi) && IS_CASEFOLDED(dir) && > - sbi->s_encoding && utf8_validate(sbi->s_encoding, &dentry->d_name)) > + if (sb_has_strict_encoding(sb) && IS_CASEFOLDED(dir) && > + sb->s_encoding && utf8_validate(sb->s_encoding, &dentry->d_name)) > return -EINVAL; hm, just noticed the sb->s_encoding check here is superfluous, since the has_strict_mode() cannot be true if !s_encoding. Not related to this patch though. Daniel, are you still working on getting this upstream? The fscrypt support would be very useful for us. :) In the hope this will get upstream, as its been flying for a while and looks correct. Reviewed-by: Gabriel Krisman Bertazi -- Gabriel Krisman Bertazi