From: Eugen Hristev <eugen.hristev@collabora.com> To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi <krisman@collabora.com> Subject: [PATCH v15 5/9] f2fs: Reuse generic_ci_match for ci comparisons Date: Tue, 2 Apr 2024 18:48:38 +0300 [thread overview] Message-ID: <20240402154842.508032-6-eugen.hristev@collabora.com> (raw) In-Reply-To: <20240402154842.508032-1-eugen.hristev@collabora.com> From: Gabriel Krisman Bertazi <krisman@collabora.com> Now that ci_match is part of libfs, make f2fs reuse it instead of having a different implementation. Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com> Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com> --- fs/f2fs/dir.c | 58 ++++----------------------------------------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 3b454f355f15..88b0045d0c4f 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -185,58 +185,6 @@ static struct f2fs_dir_entry *find_in_block(struct inode *dir, return f2fs_find_target_dentry(&d, fname, max_slots); } -#if IS_ENABLED(CONFIG_UNICODE) -/* - * Test whether a case-insensitive directory entry matches the filename - * being searched for. - * - * Returns 1 for a match, 0 for no match, and -errno on an error. - */ -static int f2fs_match_ci_name(const struct inode *dir, const struct qstr *name, - const u8 *de_name, u32 de_name_len) -{ - const struct super_block *sb = dir->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 res; - - if (IS_ENCRYPTED(dir)) { - const struct fscrypt_str encrypted_name = - FSTR_INIT((u8 *)de_name, de_name_len); - - if (WARN_ON_ONCE(!fscrypt_has_encryption_key(dir))) - return -EINVAL; - - decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); - if (!decrypted_name.name) - return -ENOMEM; - res = fscrypt_fname_disk_to_usr(dir, 0, 0, &encrypted_name, - &decrypted_name); - if (res < 0) - goto out; - entry.name = decrypted_name.name; - entry.len = decrypted_name.len; - } - - res = utf8_strncasecmp_folded(um, name, &entry); - /* - * In strict mode, ignore invalid names. In non-strict mode, - * fall back to treating them as opaque byte sequences. - */ - if (res < 0 && !sb_has_strict_encoding(sb)) { - res = name->len == entry.len && - memcmp(name->name, entry.name, name->len) == 0; - } else { - /* utf8_strncasecmp_folded returns 0 on match */ - res = (res == 0); - } -out: - kfree(decrypted_name.name); - return res; -} -#endif /* CONFIG_UNICODE */ - static inline int f2fs_match_name(const struct inode *dir, const struct f2fs_filename *fname, const u8 *de_name, u32 de_name_len) @@ -245,8 +193,10 @@ static inline int f2fs_match_name(const struct inode *dir, #if IS_ENABLED(CONFIG_UNICODE) if (fname->cf_name.name) - return f2fs_match_ci_name(dir, &fname->cf_name, - de_name, de_name_len); + return generic_ci_match(dir, fname->usr_fname, + &fname->cf_name, + de_name, de_name_len); + #endif f.usr_fname = fname->usr_fname; f.disk_name = fname->disk_name; -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Eugen Hristev via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net> To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Cc: krisman@suse.de, brauner@kernel.org, jack@suse.cz, linux-kernel@vger.kernel.org, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, kernel@collabora.com, Gabriel Krisman Bertazi <krisman@collabora.com> Subject: [f2fs-dev] [PATCH v15 5/9] f2fs: Reuse generic_ci_match for ci comparisons Date: Tue, 2 Apr 2024 18:48:38 +0300 [thread overview] Message-ID: <20240402154842.508032-6-eugen.hristev@collabora.com> (raw) In-Reply-To: <20240402154842.508032-1-eugen.hristev@collabora.com> From: Gabriel Krisman Bertazi <krisman@collabora.com> Now that ci_match is part of libfs, make f2fs reuse it instead of having a different implementation. Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com> Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com> --- fs/f2fs/dir.c | 58 ++++----------------------------------------------- 1 file changed, 4 insertions(+), 54 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 3b454f355f15..88b0045d0c4f 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -185,58 +185,6 @@ static struct f2fs_dir_entry *find_in_block(struct inode *dir, return f2fs_find_target_dentry(&d, fname, max_slots); } -#if IS_ENABLED(CONFIG_UNICODE) -/* - * Test whether a case-insensitive directory entry matches the filename - * being searched for. - * - * Returns 1 for a match, 0 for no match, and -errno on an error. - */ -static int f2fs_match_ci_name(const struct inode *dir, const struct qstr *name, - const u8 *de_name, u32 de_name_len) -{ - const struct super_block *sb = dir->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 res; - - if (IS_ENCRYPTED(dir)) { - const struct fscrypt_str encrypted_name = - FSTR_INIT((u8 *)de_name, de_name_len); - - if (WARN_ON_ONCE(!fscrypt_has_encryption_key(dir))) - return -EINVAL; - - decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); - if (!decrypted_name.name) - return -ENOMEM; - res = fscrypt_fname_disk_to_usr(dir, 0, 0, &encrypted_name, - &decrypted_name); - if (res < 0) - goto out; - entry.name = decrypted_name.name; - entry.len = decrypted_name.len; - } - - res = utf8_strncasecmp_folded(um, name, &entry); - /* - * In strict mode, ignore invalid names. In non-strict mode, - * fall back to treating them as opaque byte sequences. - */ - if (res < 0 && !sb_has_strict_encoding(sb)) { - res = name->len == entry.len && - memcmp(name->name, entry.name, name->len) == 0; - } else { - /* utf8_strncasecmp_folded returns 0 on match */ - res = (res == 0); - } -out: - kfree(decrypted_name.name); - return res; -} -#endif /* CONFIG_UNICODE */ - static inline int f2fs_match_name(const struct inode *dir, const struct f2fs_filename *fname, const u8 *de_name, u32 de_name_len) @@ -245,8 +193,10 @@ static inline int f2fs_match_name(const struct inode *dir, #if IS_ENABLED(CONFIG_UNICODE) if (fname->cf_name.name) - return f2fs_match_ci_name(dir, &fname->cf_name, - de_name, de_name_len); + return generic_ci_match(dir, fname->usr_fname, + &fname->cf_name, + de_name, de_name_len); + #endif f.usr_fname = fname->usr_fname; f.disk_name = fname->disk_name; -- 2.34.1 _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2024-04-02 15:48 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-04-02 15:48 [PATCH v15 0/9] Cache insensitive cleanup for ext4/f2fs Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-04-02 15:48 ` [PATCH v15 1/9] ext4: Simplify the handling of cached insensitive names Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-04-02 15:48 ` [PATCH v15 2/9] f2fs: " Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-04-03 3:30 ` Eric Biggers 2024-04-03 3:30 ` [f2fs-dev] " Eric Biggers 2024-04-02 15:48 ` [PATCH v15 3/9] libfs: Introduce case-insensitive string comparison helper Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-04-03 3:36 ` Eric Biggers 2024-04-03 3:36 ` [f2fs-dev] " Eric Biggers 2024-04-02 15:48 ` [PATCH v15 4/9] ext4: Reuse generic_ci_match for ci comparisons Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-04-03 3:43 ` Eric Biggers 2024-04-03 3:43 ` [f2fs-dev] " Eric Biggers 2024-04-03 4:20 ` Eric Biggers 2024-04-03 4:20 ` [f2fs-dev] " Eric Biggers 2024-04-02 15:48 ` Eugen Hristev [this message] 2024-04-02 15:48 ` [f2fs-dev] [PATCH v15 5/9] f2fs: " Eugen Hristev via Linux-f2fs-devel 2024-04-02 15:48 ` [PATCH v15 6/9] ext4: Log error when lookup of encoded dentry fails Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-04-03 4:22 ` Eric Biggers 2024-04-03 4:22 ` Eric Biggers 2024-04-03 14:39 ` Gabriel Krisman Bertazi 2024-04-03 14:39 ` Gabriel Krisman Bertazi 2024-04-02 15:48 ` [PATCH v15 7/9] f2fs: " Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-04-03 4:25 ` Eric Biggers 2024-04-03 4:25 ` Eric Biggers 2024-04-04 14:50 ` Eugen Hristev 2024-04-04 14:50 ` Eugen Hristev via Linux-f2fs-devel 2024-04-04 23:05 ` Gabriel Krisman Bertazi 2024-04-04 23:05 ` Gabriel Krisman Bertazi 2024-04-02 15:48 ` [PATCH v15 8/9] ext4: Move CONFIG_UNICODE defguards into the code flow Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-04-02 15:48 ` [PATCH v15 9/9] f2fs: " Eugen Hristev 2024-04-02 15:48 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20240402154842.508032-6-eugen.hristev@collabora.com \ --to=eugen.hristev@collabora.com \ --cc=adilger.kernel@dilger.ca \ --cc=brauner@kernel.org \ --cc=chao@kernel.org \ --cc=jack@suse.cz \ --cc=jaegeuk@kernel.org \ --cc=kernel@collabora.com \ --cc=krisman@collabora.com \ --cc=krisman@suse.de \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tytso@mit.edu \ --cc=viro@zeniv.linux.org.uk \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.