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 v14 1/9] ext4: Simplify the handling of cached insensitive names Date: Wed, 20 Mar 2024 10:46:14 +0200 [thread overview] Message-ID: <20240320084622.46643-2-eugen.hristev@collabora.com> (raw) In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> From: Gabriel Krisman Bertazi <krisman@collabora.com> Keeping it as qstr avoids the unnecessary conversion in ext4_match Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com> [eugen.hristev@collabora.com: port to 6.8-rc3] Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com> --- fs/ext4/ext4.h | 2 +- fs/ext4/namei.c | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a5d784872303..4061d11b9763 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2506,7 +2506,7 @@ struct ext4_filename { struct fscrypt_str crypto_buf; #endif #if IS_ENABLED(CONFIG_UNICODE) - struct fscrypt_str cf_name; + struct qstr cf_name; #endif }; diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 5e4f65c14dfb..b96983a4c185 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1445,7 +1445,8 @@ static int ext4_ci_compare(const struct inode *parent, const struct qstr *name, int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname, struct ext4_filename *name) { - struct fscrypt_str *cf_name = &name->cf_name; + struct qstr *cf_name = &name->cf_name; + unsigned char *buf; struct dx_hash_info *hinfo = &name->hinfo; int len; @@ -1455,18 +1456,18 @@ int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname, return 0; } - cf_name->name = kmalloc(EXT4_NAME_LEN, GFP_NOFS); - if (!cf_name->name) + buf = kmalloc(EXT4_NAME_LEN, GFP_NOFS); + if (!buf) return -ENOMEM; - len = utf8_casefold(dir->i_sb->s_encoding, - iname, cf_name->name, - EXT4_NAME_LEN); + len = utf8_casefold(dir->i_sb->s_encoding, iname, buf, EXT4_NAME_LEN); if (len <= 0) { - kfree(cf_name->name); - cf_name->name = NULL; + kfree(buf); + buf = NULL; } + cf_name->name = buf; cf_name->len = (unsigned) len; + if (!IS_ENCRYPTED(dir)) return 0; @@ -1503,8 +1504,6 @@ static bool ext4_match(struct inode *parent, if (IS_CASEFOLDED(parent) && (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) { if (fname->cf_name.name) { - struct qstr cf = {.name = fname->cf_name.name, - .len = fname->cf_name.len}; if (IS_ENCRYPTED(parent)) { if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) || fname->hinfo.minor_hash != @@ -1513,8 +1512,8 @@ static bool ext4_match(struct inode *parent, return false; } } - return !ext4_ci_compare(parent, &cf, de->name, - de->name_len, true); + return !ext4_ci_compare(parent, &fname->cf_name, + de->name, de->name_len, true); } return !ext4_ci_compare(parent, fname->usr_fname, de->name, de->name_len, false); -- 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 v14 1/9] ext4: Simplify the handling of cached insensitive names Date: Wed, 20 Mar 2024 10:46:14 +0200 [thread overview] Message-ID: <20240320084622.46643-2-eugen.hristev@collabora.com> (raw) In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> From: Gabriel Krisman Bertazi <krisman@collabora.com> Keeping it as qstr avoids the unnecessary conversion in ext4_match Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com> [eugen.hristev@collabora.com: port to 6.8-rc3] Signed-off-by: Eugen Hristev <eugen.hristev@collabora.com> --- fs/ext4/ext4.h | 2 +- fs/ext4/namei.c | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index a5d784872303..4061d11b9763 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2506,7 +2506,7 @@ struct ext4_filename { struct fscrypt_str crypto_buf; #endif #if IS_ENABLED(CONFIG_UNICODE) - struct fscrypt_str cf_name; + struct qstr cf_name; #endif }; diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 5e4f65c14dfb..b96983a4c185 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1445,7 +1445,8 @@ static int ext4_ci_compare(const struct inode *parent, const struct qstr *name, int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname, struct ext4_filename *name) { - struct fscrypt_str *cf_name = &name->cf_name; + struct qstr *cf_name = &name->cf_name; + unsigned char *buf; struct dx_hash_info *hinfo = &name->hinfo; int len; @@ -1455,18 +1456,18 @@ int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname, return 0; } - cf_name->name = kmalloc(EXT4_NAME_LEN, GFP_NOFS); - if (!cf_name->name) + buf = kmalloc(EXT4_NAME_LEN, GFP_NOFS); + if (!buf) return -ENOMEM; - len = utf8_casefold(dir->i_sb->s_encoding, - iname, cf_name->name, - EXT4_NAME_LEN); + len = utf8_casefold(dir->i_sb->s_encoding, iname, buf, EXT4_NAME_LEN); if (len <= 0) { - kfree(cf_name->name); - cf_name->name = NULL; + kfree(buf); + buf = NULL; } + cf_name->name = buf; cf_name->len = (unsigned) len; + if (!IS_ENCRYPTED(dir)) return 0; @@ -1503,8 +1504,6 @@ static bool ext4_match(struct inode *parent, if (IS_CASEFOLDED(parent) && (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) { if (fname->cf_name.name) { - struct qstr cf = {.name = fname->cf_name.name, - .len = fname->cf_name.len}; if (IS_ENCRYPTED(parent)) { if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) || fname->hinfo.minor_hash != @@ -1513,8 +1512,8 @@ static bool ext4_match(struct inode *parent, return false; } } - return !ext4_ci_compare(parent, &cf, de->name, - de->name_len, true); + return !ext4_ci_compare(parent, &fname->cf_name, + de->name, de->name_len, true); } return !ext4_ci_compare(parent, fname->usr_fname, de->name, de->name_len, false); -- 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-03-20 8:46 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-03-20 8:46 [PATCH v14 0/9] Cache insensitive cleanup for ext4/f2fs Eugen Hristev 2024-03-20 8:46 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-03-20 8:46 ` Eugen Hristev [this message] 2024-03-20 8:46 ` [f2fs-dev] [PATCH v14 1/9] ext4: Simplify the handling of cached insensitive names Eugen Hristev via Linux-f2fs-devel 2024-03-20 8:46 ` [PATCH v14 2/9] f2fs: " Eugen Hristev 2024-03-20 8:46 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-03-20 8:46 ` [PATCH v14 3/9] libfs: Introduce case-insensitive string comparison helper Eugen Hristev 2024-03-20 8:46 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-03-20 8:46 ` [PATCH v14 4/9] ext4: Reuse generic_ci_match for ci comparisons Eugen Hristev 2024-03-20 8:46 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-03-20 8:46 ` [PATCH v14 5/9] f2fs: " Eugen Hristev 2024-03-20 8:46 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-03-20 8:46 ` [PATCH v14 6/9] ext4: Log error when lookup of encoded dentry fails Eugen Hristev 2024-03-20 8:46 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-03-20 8:46 ` [PATCH v14 7/9] f2fs: " Eugen Hristev 2024-03-20 8:46 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-03-22 22:11 ` Gabriel Krisman Bertazi 2024-03-22 22:11 ` [f2fs-dev] " Gabriel Krisman Bertazi 2024-03-20 8:46 ` [PATCH v14 8/9] ext4: Move CONFIG_UNICODE defguards into the code flow Eugen Hristev 2024-03-20 8:46 ` [f2fs-dev] " Eugen Hristev via Linux-f2fs-devel 2024-03-25 16:26 ` Gabriel Krisman Bertazi 2024-03-25 16:26 ` [f2fs-dev] " Gabriel Krisman Bertazi 2024-03-20 8:46 ` [PATCH v14 9/9] f2fs: " Eugen Hristev 2024-03-20 8:46 ` [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=20240320084622.46643-2-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.