From: Jan Kara <jack@suse.cz>
To: "Pali Rohár" <pali@kernel.org>
Cc: linux-fsdevel@vger.kernel.org,
linux-ntfs-dev@lists.sourceforge.net, linux-cifs@vger.kernel.org,
jfs-discussion@lists.sourceforge.net,
linux-kernel@vger.kernel.org,
"Alexander Viro" <viro@zeniv.linux.org.uk>,
"Jan Kara" <jack@suse.cz>,
"OGAWA Hirofumi" <hirofumi@mail.parknet.co.jp>,
"Theodore Y . Ts'o" <tytso@mit.edu>,
"Luis de Bethencourt" <luisbg@kernel.org>,
"Salah Triki" <salah.triki@gmail.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Dave Kleikamp" <shaggy@kernel.org>,
"Anton Altaparmakov" <anton@tuxera.com>,
"Pavel Machek" <pavel@ucw.cz>, "Marek Behún" <marek.behun@nic.cz>,
"Christoph Hellwig" <hch@infradead.org>
Subject: Re: [RFC PATCH 03/20] udf: Fix iocharset=utf8 mount option
Date: Thu, 12 Aug 2021 16:17:36 +0200 [thread overview]
Message-ID: <20210812141736.GE14675@quack2.suse.cz> (raw)
In-Reply-To: <20210808162453.1653-4-pali@kernel.org>
On Sun 08-08-21 18:24:36, Pali Rohár wrote:
> Currently iocharset=utf8 mount option is broken. To use UTF-8 as iocharset,
> it is required to use utf8 mount option.
>
> Fix iocharset=utf8 mount option to use be equivalent to the utf8 mount
> option.
>
> If UTF-8 as iocharset is used then s_nls_map is set to NULL. So simplify
> code around, remove UDF_FLAG_NLS_MAP and UDF_FLAG_UTF8 flags as to
> distinguish between UTF-8 and non-UTF-8 it is needed just to check if
> s_nls_map set to NULL or not.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Thanks for the cleanup. It looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@suse.cz>
Or should I take this patch through my tree?
Honza
> ---
> fs/udf/super.c | 50 ++++++++++++++++++------------------------------
> fs/udf/udf_sb.h | 2 --
> fs/udf/unicode.c | 4 ++--
> 3 files changed, 21 insertions(+), 35 deletions(-)
>
> diff --git a/fs/udf/super.c b/fs/udf/super.c
> index 2f83c1204e20..6e8c29107b04 100644
> --- a/fs/udf/super.c
> +++ b/fs/udf/super.c
> @@ -349,10 +349,10 @@ static int udf_show_options(struct seq_file *seq, struct dentry *root)
> seq_printf(seq, ",lastblock=%u", sbi->s_last_block);
> if (sbi->s_anchor != 0)
> seq_printf(seq, ",anchor=%u", sbi->s_anchor);
> - if (UDF_QUERY_FLAG(sb, UDF_FLAG_UTF8))
> - seq_puts(seq, ",utf8");
> - if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP) && sbi->s_nls_map)
> + if (sbi->s_nls_map)
> seq_printf(seq, ",iocharset=%s", sbi->s_nls_map->charset);
> + else
> + seq_puts(seq, ",iocharset=utf8");
>
> return 0;
> }
> @@ -558,19 +558,24 @@ static int udf_parse_options(char *options, struct udf_options *uopt,
> /* Ignored (never implemented properly) */
> break;
> case Opt_utf8:
> - uopt->flags |= (1 << UDF_FLAG_UTF8);
> + if (!remount) {
> + unload_nls(uopt->nls_map);
> + uopt->nls_map = NULL;
> + }
> break;
> case Opt_iocharset:
> if (!remount) {
> - if (uopt->nls_map)
> - unload_nls(uopt->nls_map);
> - /*
> - * load_nls() failure is handled later in
> - * udf_fill_super() after all options are
> - * parsed.
> - */
> + unload_nls(uopt->nls_map);
> + uopt->nls_map = NULL;
> + }
> + /* When nls_map is not loaded then UTF-8 is used */
> + if (!remount && strcmp(args[0].from, "utf8") != 0) {
> uopt->nls_map = load_nls(args[0].from);
> - uopt->flags |= (1 << UDF_FLAG_NLS_MAP);
> + if (!uopt->nls_map) {
> + pr_err("iocharset %s not found\n",
> + args[0].from);
> + return 0;
> + }
> }
> break;
> case Opt_uforget:
> @@ -2139,21 +2144,6 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
> if (!udf_parse_options((char *)options, &uopt, false))
> goto parse_options_failure;
>
> - if (uopt.flags & (1 << UDF_FLAG_UTF8) &&
> - uopt.flags & (1 << UDF_FLAG_NLS_MAP)) {
> - udf_err(sb, "utf8 cannot be combined with iocharset\n");
> - goto parse_options_failure;
> - }
> - if ((uopt.flags & (1 << UDF_FLAG_NLS_MAP)) && !uopt.nls_map) {
> - uopt.nls_map = load_nls_default();
> - if (!uopt.nls_map)
> - uopt.flags &= ~(1 << UDF_FLAG_NLS_MAP);
> - else
> - udf_debug("Using default NLS map\n");
> - }
> - if (!(uopt.flags & (1 << UDF_FLAG_NLS_MAP)))
> - uopt.flags |= (1 << UDF_FLAG_UTF8);
> -
> fileset.logicalBlockNum = 0xFFFFFFFF;
> fileset.partitionReferenceNum = 0xFFFF;
>
> @@ -2308,8 +2298,7 @@ static int udf_fill_super(struct super_block *sb, void *options, int silent)
> error_out:
> iput(sbi->s_vat_inode);
> parse_options_failure:
> - if (uopt.nls_map)
> - unload_nls(uopt.nls_map);
> + unload_nls(uopt.nls_map);
> if (lvid_open)
> udf_close_lvid(sb);
> brelse(sbi->s_lvid_bh);
> @@ -2359,8 +2348,7 @@ static void udf_put_super(struct super_block *sb)
> sbi = UDF_SB(sb);
>
> iput(sbi->s_vat_inode);
> - if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
> - unload_nls(sbi->s_nls_map);
> + unload_nls(sbi->s_nls_map);
> if (!sb_rdonly(sb))
> udf_close_lvid(sb);
> brelse(sbi->s_lvid_bh);
> diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h
> index 758efe557a19..4fa620543d30 100644
> --- a/fs/udf/udf_sb.h
> +++ b/fs/udf/udf_sb.h
> @@ -20,8 +20,6 @@
> #define UDF_FLAG_UNDELETE 6
> #define UDF_FLAG_UNHIDE 7
> #define UDF_FLAG_VARCONV 8
> -#define UDF_FLAG_NLS_MAP 9
> -#define UDF_FLAG_UTF8 10
> #define UDF_FLAG_UID_FORGET 11 /* save -1 for uid to disk */
> #define UDF_FLAG_GID_FORGET 12
> #define UDF_FLAG_UID_SET 13
> diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c
> index 5fcfa96463eb..622569007b53 100644
> --- a/fs/udf/unicode.c
> +++ b/fs/udf/unicode.c
> @@ -177,7 +177,7 @@ static int udf_name_from_CS0(struct super_block *sb,
> return 0;
> }
>
> - if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
> + if (UDF_SB(sb)->s_nls_map)
> conv_f = UDF_SB(sb)->s_nls_map->uni2char;
> else
> conv_f = NULL;
> @@ -285,7 +285,7 @@ static int udf_name_to_CS0(struct super_block *sb,
> if (ocu_max_len <= 0)
> return 0;
>
> - if (UDF_QUERY_FLAG(sb, UDF_FLAG_NLS_MAP))
> + if (UDF_SB(sb)->s_nls_map)
> conv_f = UDF_SB(sb)->s_nls_map->char2uni;
> else
> conv_f = NULL;
> --
> 2.20.1
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2021-08-12 14:17 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-08 16:24 [RFC PATCH 00/20] fs: Remove usage of broken nls_utf8 and drop it Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 01/20] fat: Fix iocharset=utf8 mount option Pali Rohár
2021-08-15 3:42 ` OGAWA Hirofumi
2021-08-15 9:42 ` Pali Rohár
2021-08-15 11:23 ` OGAWA Hirofumi
2021-08-23 3:51 ` Kari Argillander
2021-08-08 16:24 ` [RFC PATCH 02/20] hfsplus: Add iocharset= mount option as alias for nls= Pali Rohár
2021-08-09 17:51 ` Viacheslav Dubeyko
2021-08-09 20:49 ` Kari Argillander
2021-08-09 21:25 ` Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 03/20] udf: Fix iocharset=utf8 mount option Pali Rohár
2021-08-12 14:17 ` Jan Kara [this message]
2021-08-12 15:51 ` Pali Rohár
2021-08-13 13:48 ` Jan Kara
2021-08-19 8:34 ` Pali Rohár
2021-08-19 10:41 ` Jan Kara
2021-08-08 16:24 ` [RFC PATCH 04/20] isofs: joliet: " Pali Rohár
2021-08-12 14:18 ` Jan Kara
2021-08-08 16:24 ` [RFC PATCH 05/20] ntfs: Undeprecate iocharset= " Pali Rohár
2021-08-09 20:52 ` Kari Argillander
2021-08-19 1:21 ` Kari Argillander
2021-08-19 8:12 ` Pali Rohár
2021-08-19 10:23 ` Kari Argillander
2021-08-19 22:04 ` Pali Rohár
2021-08-19 23:18 ` Kari Argillander
2021-08-08 16:24 ` [RFC PATCH 06/20] ntfs: Fix error processing when load_nls() fails Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 07/20] befs: Fix printing iocharset= mount option Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 08/20] befs: Rename enum value Opt_charset to Opt_iocharset to match " Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 09/20] befs: Fix error processing when load_nls() fails Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 10/20] befs: Allow to use native UTF-8 mode Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 11/20] hfs: Explicitly set hsb->nls_disk when hsb->nls_io is set Pali Rohár
2021-08-09 17:31 ` Viacheslav Dubeyko
2021-08-09 17:37 ` Matthew Wilcox
2021-08-09 17:47 ` Pali Rohár
2021-08-09 20:43 ` Steve French
2021-08-09 18:00 ` Viacheslav Dubeyko
2021-08-08 16:24 ` [RFC PATCH 12/20] hfs: Do not use broken utf8 NLS table for iocharset=utf8 mount option Pali Rohár
2021-08-09 17:49 ` Viacheslav Dubeyko
2022-09-25 12:06 ` Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 13/20] hfsplus: " Pali Rohár
2021-08-09 17:42 ` Viacheslav Dubeyko
2022-09-25 12:12 ` Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 14/20] jfs: Remove custom iso8859-1 implementation Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 15/20] jfs: Fix buffer overflow in jfs_strfromUCS_le() function Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 16/20] jfs: Do not use broken utf8 NLS table for iocharset=utf8 mount option Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 17/20] ntfs: " Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 18/20] cifs: " Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 19/20] cifs: Remove usage of load_nls_default() calls Pali Rohár
2021-08-08 16:24 ` [RFC PATCH 20/20] nls: Drop broken nls_utf8 module Pali Rohár
2021-09-03 21:26 ` [RFC PATCH 00/20] fs: Remove usage of broken nls_utf8 and drop it Kari Argillander
2021-09-03 21:37 ` Pali Rohár
2021-09-03 22:06 ` Kari Argillander
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=20210812141736.GE14675@quack2.suse.cz \
--to=jack@suse.cz \
--cc=akpm@linux-foundation.org \
--cc=anton@tuxera.com \
--cc=hch@infradead.org \
--cc=hirofumi@mail.parknet.co.jp \
--cc=jfs-discussion@lists.sourceforge.net \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=luisbg@kernel.org \
--cc=marek.behun@nic.cz \
--cc=pali@kernel.org \
--cc=pavel@ucw.cz \
--cc=salah.triki@gmail.com \
--cc=shaggy@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 NNTP newsgroup(s).