From: Gabriel Krisman Bertazi <krisman@collabora.com> To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org, ebiggers@kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Gabriel Krisman Bertazi <krisman@collabora.com>, kernel@collabora.com, Eric Biggers <ebiggers@google.com> Subject: [PATCH v8 1/8] ext4: Simplify the handling of cached insensitive names Date: Thu, 19 May 2022 17:23:52 -0400 [thread overview] Message-ID: <20220519212359.19442-2-krisman@collabora.com> (raw) In-Reply-To: <20220519212359.19442-1-krisman@collabora.com> Keeping it as qstr avoids the unnecessary conversion in ext4_match Reviewed-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com> --- Changes since v1: - Simplify hunk (eric) --- 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 a743b1e3b89e..93a28fcb2e22 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2490,7 +2490,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 767b4bfe39c3..206fcf8fdc16 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1373,7 +1373,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; @@ -1383,18 +1384,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; @@ -1432,8 +1433,6 @@ static bool ext4_match(struct inode *parent, if (parent->i_sb->s_encoding && 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 != @@ -1442,8 +1441,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.36.1
WARNING: multiple messages have this Message-ID (diff)
From: Gabriel Krisman Bertazi <krisman@collabora.com> To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org, ebiggers@kernel.org Cc: linux-ext4@vger.kernel.org, Gabriel Krisman Bertazi <krisman@collabora.com>, kernel@collabora.com, Eric Biggers <ebiggers@google.com>, linux-f2fs-devel@lists.sourceforge.net Subject: [f2fs-dev] [PATCH v8 1/8] ext4: Simplify the handling of cached insensitive names Date: Thu, 19 May 2022 17:23:52 -0400 [thread overview] Message-ID: <20220519212359.19442-2-krisman@collabora.com> (raw) In-Reply-To: <20220519212359.19442-1-krisman@collabora.com> Keeping it as qstr avoids the unnecessary conversion in ext4_match Reviewed-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com> --- Changes since v1: - Simplify hunk (eric) --- 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 a743b1e3b89e..93a28fcb2e22 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -2490,7 +2490,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 767b4bfe39c3..206fcf8fdc16 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1373,7 +1373,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; @@ -1383,18 +1384,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; @@ -1432,8 +1433,6 @@ static bool ext4_match(struct inode *parent, if (parent->i_sb->s_encoding && 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 != @@ -1442,8 +1441,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.36.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:[~2022-05-19 21:24 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-19 21:23 [PATCH v8 0/8] Clean up the case-insensitive lookup path Gabriel Krisman Bertazi 2022-05-19 21:23 ` [f2fs-dev] " Gabriel Krisman Bertazi 2022-05-19 21:23 ` Gabriel Krisman Bertazi [this message] 2022-05-19 21:23 ` [f2fs-dev] [PATCH v8 1/8] ext4: Simplify the handling of cached insensitive names Gabriel Krisman Bertazi 2022-05-19 21:23 ` [PATCH v8 2/8] f2fs: " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [f2fs-dev] " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [PATCH v8 3/8] libfs: Introduce case-insensitive string comparison helper Gabriel Krisman Bertazi 2022-05-19 21:23 ` [f2fs-dev] " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [PATCH v8 4/8] ext4: Reuse generic_ci_match for ci comparisons Gabriel Krisman Bertazi 2022-05-19 21:23 ` [f2fs-dev] " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [PATCH v8 5/8] f2fs: " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [f2fs-dev] " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [PATCH v8 6/8] ext4: Log error when lookup of encoded dentry fails Gabriel Krisman Bertazi 2022-05-19 21:23 ` [f2fs-dev] " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [PATCH v8 7/8] ext4: Move CONFIG_UNICODE defguards into the code flow Gabriel Krisman Bertazi 2022-05-19 21:23 ` [f2fs-dev] " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [PATCH v8 8/8] f2fs: " Gabriel Krisman Bertazi 2022-05-19 21:23 ` [f2fs-dev] " Gabriel Krisman Bertazi
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=20220519212359.19442-2-krisman@collabora.com \ --to=krisman@collabora.com \ --cc=adilger.kernel@dilger.ca \ --cc=ebiggers@google.com \ --cc=ebiggers@kernel.org \ --cc=jaegeuk@kernel.org \ --cc=kernel@collabora.com \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=tytso@mit.edu \ /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.