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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D277C433F5 for ; Wed, 11 May 2022 19:32:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346941AbiEKTcX (ORCPT ); Wed, 11 May 2022 15:32:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346890AbiEKTcV (ORCPT ); Wed, 11 May 2022 15:32:21 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF81AFFA90 for ; Wed, 11 May 2022 12:32:19 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id 987211F42944 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652297538; bh=a8sssBLcQvf+HLVmuG0sfdDXgG2gwA/kjMiWWYhyeDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XT7pcUCRsxugFY70TnhWWnubU/Gk8u5OmmS6OssMjrnCnRKt0tj2N21ZcNbThqhTi huHpB1/7v+HMlQS2EU7ajCnBTujYUQ/IojystIxAc24k9VSq3QskL8XWKoTivQnIfy t0ISjsWB3hFkONUOH/oqViGWwn2q1KwRHWt0Yg7DeJgNDD7GnpZSZlIt7URtTpC41b y7ccVSrneN6lyWLFF4Zg6OW9WPqi9rs8yLMWRqMZBptBAfcYRVO5NHi7lqDAmnRgCN 9BIVj320fXgFT1mPgkeRHQVk/+bdGp5AccsSFDmVN45camk+6noHB/5+/cwezqbg4s LVma1dwuOUoYw== From: Gabriel Krisman Bertazi To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, ebiggers@kernel.org, Gabriel Krisman Bertazi , kernel@collabora.com Subject: [PATCH v4 07/10] ext4: Move ext4_match_ci into libfs Date: Wed, 11 May 2022 15:31:43 -0400 Message-Id: <20220511193146.27526-8-krisman@collabora.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220511193146.27526-1-krisman@collabora.com> References: <20220511193146.27526-1-krisman@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Matching case-insensitive names is a generic operation and can be shared with f2fs. Move it next to the rest of the shared casefold fs code. Signed-off-by: Gabriel Krisman Bertazi --- fs/ext4/namei.c | 62 +--------------------------------------------- fs/libfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 3 +++ 3 files changed, 65 insertions(+), 61 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 708811525411..16fd0df5f8a8 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1318,66 +1318,6 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) } #if IS_ENABLED(CONFIG_UNICODE) -/** - * ext4_match_ci() - Match (case-insensitive) a name with a dirent. - * @parent: Inode of the parent of the dentry. - * @uname: name under lookup. - * @de_name: Dirent name. - * @de_name_len: dirent name length. - * - * Test whether a case-insensitive directory entry matches the filename - * being searched. - * - * Return: > 0 if the directory entry matches, 0 if it doesn't match, or - * < 0 on error. - */ -static int ext4_match_ci(const struct inode *parent, - const struct unicode_name *uname, - u8 *de_name, size_t de_name_len) -{ - const struct super_block *sb = parent->i_sb; - const struct unicode_map *um = sb->s_encoding; - struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len); - struct qstr entry = QSTR_INIT(de_name, de_name_len); - int ret, match = false; - - if (IS_ENCRYPTED(parent)) { - const struct fscrypt_str encrypted_name = - FSTR_INIT(de_name, de_name_len); - - decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); - if (!decrypted_name.name) - return -ENOMEM; - ret = fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name, - &decrypted_name); - if (ret < 0) - goto out; - entry.name = decrypted_name.name; - entry.len = decrypted_name.len; - } - - if (uname->folded_name->name) - ret = utf8_strncasecmp_folded(um, uname->folded_name, &entry); - else - ret = utf8_strncasecmp(um, uname->usr_name, &entry); - - if (!ret) - match = true; - else if (ret < 0 && !sb_has_strict_encoding(sb)) { - /* - * In non-strict mode, fallback to a byte comparison if - * the names have invalid characters. - */ - ret = 0; - match = ((uname->usr_name->len == entry.len) && - !memcmp(uname->usr_name->name, entry.name, entry.len)); - } - -out: - kfree(decrypted_name.name); - return (ret >= 0) ? match : ret; -} - int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname, struct ext4_filename *name) { @@ -1451,7 +1391,7 @@ static bool ext4_match(struct inode *parent, }; int ret; - ret = ext4_match_ci(parent, &u, de->name, de->name_len); + ret = generic_ci_match(parent, &u, de->name, de->name_len); if (ret < 0) { /* * Treat comparison errors as not a match. The diff --git a/fs/libfs.c b/fs/libfs.c index 974125270a42..c14b3fa615f5 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1465,6 +1465,67 @@ static const struct dentry_operations generic_ci_dentry_ops = { .d_hash = generic_ci_d_hash, .d_compare = generic_ci_d_compare, }; + +/** + * generic_ci_match() - Match (case-insensitive) a name with a dirent. + * @parent: Inode of the parent of the dentry. + * @uname: name under lookup. + * @de_name: Dirent name. + * @de_name_len: dirent name length. + * + * Test whether a case-insensitive directory entry matches the filename + * being searched. + * + * Return: > 0 if the directory entry matches, 0 if it doesn't match, or + * < 0 on error. + */ +int generic_ci_match(const struct inode *parent, + const struct unicode_name *uname, + u8 *de_name, size_t de_name_len) +{ + const struct super_block *sb = parent->i_sb; + const struct unicode_map *um = sb->s_encoding; + struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len); + struct qstr entry = QSTR_INIT(de_name, de_name_len); + int ret, match = false; + + if (IS_ENCRYPTED(parent)) { + const struct fscrypt_str encrypted_name = + FSTR_INIT(de_name, de_name_len); + + decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); + if (!decrypted_name.name) + return -ENOMEM; + ret = fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name, + &decrypted_name); + if (ret < 0) + goto out; + entry.name = decrypted_name.name; + entry.len = decrypted_name.len; + } + + if (uname->folded_name->name) + ret = utf8_strncasecmp_folded(um, uname->folded_name, &entry); + else + ret = utf8_strncasecmp(um, uname->usr_name, &entry); + + if (!ret) + match = true; + else if (ret < 0 && !sb_has_strict_encoding(sb)) { + /* + * In non-strict mode, fallback to a byte comparison if + * the names have invalid characters. + */ + ret = 0; + match = ((uname->usr_name->len == entry.len) && + !memcmp(uname->usr_name->name, entry.name, entry.len)); + } + +out: + kfree(decrypted_name.name); + return (ret >= 0) ? match : ret; +} +EXPORT_SYMBOL(generic_ci_match); #endif #ifdef CONFIG_FS_ENCRYPTION diff --git a/include/linux/fs.h b/include/linux/fs.h index 3f76a18a5f40..6a750b8704c9 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3364,6 +3364,9 @@ struct unicode_name { }; extern void generic_set_encrypted_ci_d_ops(struct dentry *dentry); +extern int generic_ci_match(const struct inode *parent, + const struct unicode_name *uname, u8 *de_name, + size_t de_name_len); #ifdef CONFIG_MIGRATION extern int buffer_migrate_page(struct address_space *, -- 2.36.1 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 Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 98710C433F5 for ; Wed, 11 May 2022 19:32:28 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nos4S-0001s6-DK; Wed, 11 May 2022 19:32:26 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nos4R-0001rs-MZ for linux-f2fs-devel@lists.sourceforge.net; Wed, 11 May 2022 19:32:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=TwDvFHJIpdTpuqGe1VVLRTHRGveYNfm0D8ZsInn9h7E=; b=LlIea3cqTpBrJjfqidETJuBhC5 IMx3sEuIvMAziwXJem9qvzIulMZ1AhiSAC4bNR59BlffUzgiQQ0Ztoitk3SF7dzBqoOWZpp17bycU +FYE9+zIWtg3GwYkSKu/c3GvMWQEhS3zIZrr3SeFzpkBqYgIveRJ1zuvw1XmyQAPCsUs=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=TwDvFHJIpdTpuqGe1VVLRTHRGveYNfm0D8ZsInn9h7E=; b=fZLy+QvLCWLXAmdDjPbOHM8oCv mbWzNcqFLjlFsOO6jtsnqW3G4EwvjlEvwo7q9gETnDkCM+xQG8d0+NTA7RAjzW3iPe05KPrzT4fPl UGjYFGLFcxCgqpQG6PUhiovMjZbBbjLg8PKrTqwOU5EXjT0FhkOnzBOgGzmR00/kkpWk=; Received: from bhuna.collabora.co.uk ([46.235.227.227]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nos4O-0007JR-UZ for linux-f2fs-devel@lists.sourceforge.net; Wed, 11 May 2022 19:32:25 +0000 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id 987211F42944 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652297538; bh=a8sssBLcQvf+HLVmuG0sfdDXgG2gwA/kjMiWWYhyeDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XT7pcUCRsxugFY70TnhWWnubU/Gk8u5OmmS6OssMjrnCnRKt0tj2N21ZcNbThqhTi huHpB1/7v+HMlQS2EU7ajCnBTujYUQ/IojystIxAc24k9VSq3QskL8XWKoTivQnIfy t0ISjsWB3hFkONUOH/oqViGWwn2q1KwRHWt0Yg7DeJgNDD7GnpZSZlIt7URtTpC41b y7ccVSrneN6lyWLFF4Zg6OW9WPqi9rs8yLMWRqMZBptBAfcYRVO5NHi7lqDAmnRgCN 9BIVj320fXgFT1mPgkeRHQVk/+bdGp5AccsSFDmVN45camk+6noHB/5+/cwezqbg4s LVma1dwuOUoYw== From: Gabriel Krisman Bertazi To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org Date: Wed, 11 May 2022 15:31:43 -0400 Message-Id: <20220511193146.27526-8-krisman@collabora.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220511193146.27526-1-krisman@collabora.com> References: <20220511193146.27526-1-krisman@collabora.com> MIME-Version: 1.0 X-Headers-End: 1nos4O-0007JR-UZ Subject: [f2fs-dev] [PATCH v4 07/10] ext4: Move ext4_match_ci into libfs X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ebiggers@kernel.org, linux-ext4@vger.kernel.org, Gabriel Krisman Bertazi , kernel@collabora.com, linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Matching case-insensitive names is a generic operation and can be shared with f2fs. Move it next to the rest of the shared casefold fs code. Signed-off-by: Gabriel Krisman Bertazi --- fs/ext4/namei.c | 62 +--------------------------------------------- fs/libfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 3 +++ 3 files changed, 65 insertions(+), 61 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 708811525411..16fd0df5f8a8 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1318,66 +1318,6 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) } #if IS_ENABLED(CONFIG_UNICODE) -/** - * ext4_match_ci() - Match (case-insensitive) a name with a dirent. - * @parent: Inode of the parent of the dentry. - * @uname: name under lookup. - * @de_name: Dirent name. - * @de_name_len: dirent name length. - * - * Test whether a case-insensitive directory entry matches the filename - * being searched. - * - * Return: > 0 if the directory entry matches, 0 if it doesn't match, or - * < 0 on error. - */ -static int ext4_match_ci(const struct inode *parent, - const struct unicode_name *uname, - u8 *de_name, size_t de_name_len) -{ - const struct super_block *sb = parent->i_sb; - const struct unicode_map *um = sb->s_encoding; - struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len); - struct qstr entry = QSTR_INIT(de_name, de_name_len); - int ret, match = false; - - if (IS_ENCRYPTED(parent)) { - const struct fscrypt_str encrypted_name = - FSTR_INIT(de_name, de_name_len); - - decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); - if (!decrypted_name.name) - return -ENOMEM; - ret = fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name, - &decrypted_name); - if (ret < 0) - goto out; - entry.name = decrypted_name.name; - entry.len = decrypted_name.len; - } - - if (uname->folded_name->name) - ret = utf8_strncasecmp_folded(um, uname->folded_name, &entry); - else - ret = utf8_strncasecmp(um, uname->usr_name, &entry); - - if (!ret) - match = true; - else if (ret < 0 && !sb_has_strict_encoding(sb)) { - /* - * In non-strict mode, fallback to a byte comparison if - * the names have invalid characters. - */ - ret = 0; - match = ((uname->usr_name->len == entry.len) && - !memcmp(uname->usr_name->name, entry.name, entry.len)); - } - -out: - kfree(decrypted_name.name); - return (ret >= 0) ? match : ret; -} - int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname, struct ext4_filename *name) { @@ -1451,7 +1391,7 @@ static bool ext4_match(struct inode *parent, }; int ret; - ret = ext4_match_ci(parent, &u, de->name, de->name_len); + ret = generic_ci_match(parent, &u, de->name, de->name_len); if (ret < 0) { /* * Treat comparison errors as not a match. The diff --git a/fs/libfs.c b/fs/libfs.c index 974125270a42..c14b3fa615f5 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1465,6 +1465,67 @@ static const struct dentry_operations generic_ci_dentry_ops = { .d_hash = generic_ci_d_hash, .d_compare = generic_ci_d_compare, }; + +/** + * generic_ci_match() - Match (case-insensitive) a name with a dirent. + * @parent: Inode of the parent of the dentry. + * @uname: name under lookup. + * @de_name: Dirent name. + * @de_name_len: dirent name length. + * + * Test whether a case-insensitive directory entry matches the filename + * being searched. + * + * Return: > 0 if the directory entry matches, 0 if it doesn't match, or + * < 0 on error. + */ +int generic_ci_match(const struct inode *parent, + const struct unicode_name *uname, + u8 *de_name, size_t de_name_len) +{ + const struct super_block *sb = parent->i_sb; + const struct unicode_map *um = sb->s_encoding; + struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len); + struct qstr entry = QSTR_INIT(de_name, de_name_len); + int ret, match = false; + + if (IS_ENCRYPTED(parent)) { + const struct fscrypt_str encrypted_name = + FSTR_INIT(de_name, de_name_len); + + decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); + if (!decrypted_name.name) + return -ENOMEM; + ret = fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name, + &decrypted_name); + if (ret < 0) + goto out; + entry.name = decrypted_name.name; + entry.len = decrypted_name.len; + } + + if (uname->folded_name->name) + ret = utf8_strncasecmp_folded(um, uname->folded_name, &entry); + else + ret = utf8_strncasecmp(um, uname->usr_name, &entry); + + if (!ret) + match = true; + else if (ret < 0 && !sb_has_strict_encoding(sb)) { + /* + * In non-strict mode, fallback to a byte comparison if + * the names have invalid characters. + */ + ret = 0; + match = ((uname->usr_name->len == entry.len) && + !memcmp(uname->usr_name->name, entry.name, entry.len)); + } + +out: + kfree(decrypted_name.name); + return (ret >= 0) ? match : ret; +} +EXPORT_SYMBOL(generic_ci_match); #endif #ifdef CONFIG_FS_ENCRYPTION diff --git a/include/linux/fs.h b/include/linux/fs.h index 3f76a18a5f40..6a750b8704c9 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3364,6 +3364,9 @@ struct unicode_name { }; extern void generic_set_encrypted_ci_d_ops(struct dentry *dentry); +extern int generic_ci_match(const struct inode *parent, + const struct unicode_name *uname, u8 *de_name, + size_t de_name_len); #ifdef CONFIG_MIGRATION extern int buffer_migrate_page(struct address_space *, -- 2.36.1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel