From: Eric Biggers <ebiggers@kernel.org>
To: Eugen Hristev <eugen.hristev@collabora.com>
Cc: 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, linux-kernel@vger.kernel.org,
kernel@collabora.com, viro@zeniv.linux.org.uk,
brauner@kernel.org, jack@suse.cz, krisman@suse.de,
Gabriel Krisman Bertazi <krisman@collabora.com>
Subject: Re: [PATCH v15 3/9] libfs: Introduce case-insensitive string comparison helper
Date: Tue, 2 Apr 2024 20:36:07 -0700 [thread overview]
Message-ID: <20240403033607.GE2576@sol.localdomain> (raw)
In-Reply-To: <20240402154842.508032-4-eugen.hristev@collabora.com>
On Tue, Apr 02, 2024 at 06:48:36PM +0300, Eugen Hristev wrote:
> +int generic_ci_match(const struct inode *parent,
> + const struct qstr *name,
> + const struct qstr *folded_name,
> + const u8 *de_name, u32 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 dirent = QSTR_INIT(de_name, de_name_len);
> + int res = 0, match = 0;
> +
> + if (IS_ENCRYPTED(parent)) {
> + const struct fscrypt_str encrypted_name =
> + FSTR_INIT((u8 *) de_name, de_name_len);
> +
> + if (WARN_ON_ONCE(!fscrypt_has_encryption_key(parent)))
> + return -EINVAL;
> +
> + decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL);
> + if (!decrypted_name.name)
> + return -ENOMEM;
> + res = fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name,
> + &decrypted_name);
> + if (res < 0)
> + goto out;
> + dirent.name = decrypted_name.name;
> + dirent.len = decrypted_name.len;
> + }
> +
> + /*
> + * Attempt a case-sensitive match first. It is cheaper and
> + * should cover most lookups, including all the sane
> + * applications that expect a case-sensitive filesystem.
> + */
> + if (folded_name->name) {
> + if (dirent.len == folded_name->len &&
> + !memcmp(folded_name->name, dirent.name, dirent.len)) {
> + match = 1;
> + goto out;
> + }
> + res = utf8_strncasecmp_folded(um, folded_name, &dirent);
> + } else {
> + if (dirent.len == name->len &&
> + !memcmp(name->name, dirent.name, dirent.len) &&
> + (!sb_has_strict_encoding(sb) || !utf8_validate(um, name))) {
> + match = 1;
> + goto out;
> + }
> + res = utf8_strncasecmp(um, name, &dirent);
> + }
The 'match' variable is unnecessary because setting res=0 achieves the same
effect.
- Eric
next prev parent reply other threads:[~2024-04-03 3:36 UTC|newest]
Thread overview: 19+ 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 ` [PATCH v15 1/9] ext4: Simplify the handling of cached insensitive names Eugen Hristev
2024-04-02 15:48 ` [PATCH v15 2/9] f2fs: " Eugen Hristev
2024-04-03 3:30 ` Eric Biggers
2024-04-02 15:48 ` [PATCH v15 3/9] libfs: Introduce case-insensitive string comparison helper Eugen Hristev
2024-04-03 3:36 ` Eric Biggers [this message]
2024-04-02 15:48 ` [PATCH v15 4/9] ext4: Reuse generic_ci_match for ci comparisons Eugen Hristev
2024-04-03 3:43 ` Eric Biggers
2024-04-03 4:20 ` Eric Biggers
2024-04-02 15:48 ` [PATCH v15 5/9] f2fs: " Eugen Hristev
2024-04-02 15:48 ` [PATCH v15 6/9] ext4: Log error when lookup of encoded dentry fails Eugen Hristev
2024-04-03 4:22 ` [f2fs-dev] " Eric Biggers
2024-04-03 14:39 ` Gabriel Krisman Bertazi
2024-04-02 15:48 ` [PATCH v15 7/9] f2fs: " Eugen Hristev
2024-04-03 4:25 ` [f2fs-dev] " Eric Biggers
2024-04-04 14:50 ` Eugen Hristev
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 ` [PATCH v15 9/9] f2fs: " Eugen Hristev
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=20240403033607.GE2576@sol.localdomain \
--to=ebiggers@kernel.org \
--cc=adilger.kernel@dilger.ca \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=eugen.hristev@collabora.com \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox