From: Gabriel Krisman Bertazi <krisman@suse.de>
To: Eugen Hristev via Linux-f2fs-devel
<linux-f2fs-devel@lists.sourceforge.net>
Cc: tytso@mit.edu, adilger.kernel@dilger.ca,
linux-ext4@vger.kernel.org, jaegeuk@kernel.org,
chao@kernel.org, linux-fsdevel@vger.kernel.org,
Eugen Hristev <eugen.hristev@collabora.com>,
brauner@kernel.org, jack@suse.cz,
Eric Biggers <ebiggers@google.com>,
linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk,
kernel@collabora.com,
Gabriel Krisman Bertazi <krisman@collabora.com>
Subject: Re: [f2fs-dev] [PATCH v10 7/8] ext4: Move CONFIG_UNICODE defguards into the code flow
Date: Fri, 22 Mar 2024 18:11:35 -0400 [thread overview]
Message-ID: <87ttkx9aso.fsf@mailhost.krisman.be> (raw)
In-Reply-To: <20240215042654.359210-8-eugen.hristev@collabora.com> (Eugen Hristev via Linux-f2fs-devel's message of "Thu, 15 Feb 2024 06:26:53 +0200")
Eugen Hristev via Linux-f2fs-devel
<linux-f2fs-devel@lists.sourceforge.net> writes:
> From: Gabriel Krisman Bertazi <krisman@collabora.com>
>
> Instead of a bunch of ifdefs, make the unicode built checks part of the
> code flow where possible, as requested by Torvalds.
>
> Reviewed-by: Eric Biggers <ebiggers@google.com>
> 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/crypto.c | 19 +++----------------
> fs/ext4/ext4.h | 33 +++++++++++++++++++++------------
> fs/ext4/namei.c | 14 +++++---------
> fs/ext4/super.c | 4 +---
> 4 files changed, 30 insertions(+), 40 deletions(-)
>
> diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c
> index 7ae0b61258a7..1d2f8b79529c 100644
> --- a/fs/ext4/crypto.c
> +++ b/fs/ext4/crypto.c
> @@ -31,12 +31,7 @@ int ext4_fname_setup_filename(struct inode *dir, const struct qstr *iname,
>
> ext4_fname_from_fscrypt_name(fname, &name);
>
> -#if IS_ENABLED(CONFIG_UNICODE)
> - err = ext4_fname_setup_ci_filename(dir, iname, fname);
> - if (err)
> - ext4_fname_free_filename(fname);
> -#endif
> - return err;
> + return ext4_fname_setup_ci_filename(dir, iname, fname);
This shouldn't remove the error path. It effectively reintroduces the
memory leak fixed by commit 7ca4b085f430 ("ext4: fix memory leaks in
ext4_fname_{setup_filename,prepare_lookup}").
This patch was only about inlining the codeguards, so it shouldn't be
changing the logic.
> }
>
> int ext4_fname_prepare_lookup(struct inode *dir, struct dentry *dentry,
> @@ -51,12 +46,7 @@ int ext4_fname_prepare_lookup(struct inode *dir, struct dentry *dentry,
>
> ext4_fname_from_fscrypt_name(fname, &name);
>
> -#if IS_ENABLED(CONFIG_UNICODE)
> - err = ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname);
> - if (err)
> - ext4_fname_free_filename(fname);
> -#endif
> - return err;
> + return ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname);
> }
likewise
--
Gabriel Krisman Bertazi
next prev parent reply other threads:[~2024-03-22 22:11 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 4:26 [PATCH v10 0/8] Eugen Hristev
2024-02-15 4:26 ` [PATCH v10 1/8] ext4: Simplify the handling of cached insensitive names Eugen Hristev
2024-02-15 4:26 ` [PATCH v10 2/8] f2fs: " Eugen Hristev
2024-02-15 4:26 ` [PATCH v10 3/8] libfs: Introduce case-insensitive string comparison helper Eugen Hristev
2024-02-16 16:12 ` Gabriel Krisman Bertazi
2024-02-19 4:22 ` Eugen Hristev
2024-02-19 14:55 ` Gabriel Krisman Bertazi
2024-02-20 7:36 ` Eugen Hristev
2024-02-20 14:59 ` Gabriel Krisman Bertazi
2024-02-15 4:26 ` [PATCH v10 4/8] ext4: Reuse generic_ci_match for ci comparisons Eugen Hristev
2024-02-15 4:26 ` [PATCH v10 5/8] f2fs: " Eugen Hristev
2024-02-15 4:26 ` [PATCH v10 6/8] ext4: Log error when lookup of encoded dentry fails Eugen Hristev
2024-02-15 4:26 ` [PATCH v10 7/8] ext4: Move CONFIG_UNICODE defguards into the code flow Eugen Hristev
2024-03-22 22:11 ` Gabriel Krisman Bertazi [this message]
2024-02-15 4:26 ` [PATCH v10 8/8] 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=87ttkx9aso.fsf@mailhost.krisman.be \
--to=krisman@suse.de \
--cc=adilger.kernel@dilger.ca \
--cc=brauner@kernel.org \
--cc=chao@kernel.org \
--cc=ebiggers@google.com \
--cc=eugen.hristev@collabora.com \
--cc=jack@suse.cz \
--cc=jaegeuk@kernel.org \
--cc=kernel@collabora.com \
--cc=krisman@collabora.com \
--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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).