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 04/20] isofs: joliet: Fix iocharset=utf8 mount option Date: Thu, 12 Aug 2021 16:18:11 +0200 [thread overview] Message-ID: <20210812141811.GF14675@quack2.suse.cz> (raw) In-Reply-To: <20210808162453.1653-5-pali@kernel.org> On Sun 08-08-21 18:24:37, 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_iocharset is set to NULL. So > simplify code around, remove s_utf8 field as to distinguish between UTF-8 > and non-UTF-8 it is needed just to check if s_nls_iocharset is set to NULL > or not. > > Signed-off-by: Pali Rohár <pali@kernel.org> Looks good to me. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> I can also take this patch through my tree if you want. Honza > --- > fs/isofs/inode.c | 27 +++++++++++++-------------- > fs/isofs/isofs.h | 1 - > fs/isofs/joliet.c | 4 +--- > 3 files changed, 14 insertions(+), 18 deletions(-) > > diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c > index 21edc423b79f..678e2c51b855 100644 > --- a/fs/isofs/inode.c > +++ b/fs/isofs/inode.c > @@ -155,7 +155,6 @@ struct iso9660_options{ > unsigned int overriderockperm:1; > unsigned int uid_set:1; > unsigned int gid_set:1; > - unsigned int utf8:1; > unsigned char map; > unsigned char check; > unsigned int blocksize; > @@ -356,7 +355,6 @@ static int parse_options(char *options, struct iso9660_options *popt) > popt->gid = GLOBAL_ROOT_GID; > popt->uid = GLOBAL_ROOT_UID; > popt->iocharset = NULL; > - popt->utf8 = 0; > popt->overriderockperm = 0; > popt->session=-1; > popt->sbsector=-1; > @@ -389,10 +387,13 @@ static int parse_options(char *options, struct iso9660_options *popt) > case Opt_cruft: > popt->cruft = 1; > break; > +#ifdef CONFIG_JOLIET > case Opt_utf8: > - popt->utf8 = 1; > + kfree(popt->iocharset); > + popt->iocharset = kstrdup("utf8", GFP_KERNEL); > + if (!popt->iocharset) > + return 0; > break; > -#ifdef CONFIG_JOLIET > case Opt_iocharset: > kfree(popt->iocharset); > popt->iocharset = match_strdup(&args[0]); > @@ -495,7 +496,6 @@ static int isofs_show_options(struct seq_file *m, struct dentry *root) > if (sbi->s_nocompress) seq_puts(m, ",nocompress"); > if (sbi->s_overriderockperm) seq_puts(m, ",overriderockperm"); > if (sbi->s_showassoc) seq_puts(m, ",showassoc"); > - if (sbi->s_utf8) seq_puts(m, ",utf8"); > > if (sbi->s_check) seq_printf(m, ",check=%c", sbi->s_check); > if (sbi->s_mapping) seq_printf(m, ",map=%c", sbi->s_mapping); > @@ -518,9 +518,10 @@ static int isofs_show_options(struct seq_file *m, struct dentry *root) > seq_printf(m, ",fmode=%o", sbi->s_fmode); > > #ifdef CONFIG_JOLIET > - if (sbi->s_nls_iocharset && > - strcmp(sbi->s_nls_iocharset->charset, CONFIG_NLS_DEFAULT) != 0) > + if (sbi->s_nls_iocharset) > seq_printf(m, ",iocharset=%s", sbi->s_nls_iocharset->charset); > + else > + seq_puts(m, ",iocharset=utf8"); > #endif > return 0; > } > @@ -863,14 +864,13 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) > sbi->s_nls_iocharset = NULL; > > #ifdef CONFIG_JOLIET > - if (joliet_level && opt.utf8 == 0) { > + if (joliet_level) { > char *p = opt.iocharset ? opt.iocharset : CONFIG_NLS_DEFAULT; > - sbi->s_nls_iocharset = load_nls(p); > - if (! sbi->s_nls_iocharset) { > - /* Fail only if explicit charset specified */ > - if (opt.iocharset) > + if (strcmp(p, "utf8") != 0) { > + sbi->s_nls_iocharset = opt.iocharset ? > + load_nls(opt.iocharset) : load_nls_default(); > + if (!sbi->s_nls_iocharset) > goto out_freesbi; > - sbi->s_nls_iocharset = load_nls_default(); > } > } > #endif > @@ -886,7 +886,6 @@ static int isofs_fill_super(struct super_block *s, void *data, int silent) > sbi->s_gid = opt.gid; > sbi->s_uid_set = opt.uid_set; > sbi->s_gid_set = opt.gid_set; > - sbi->s_utf8 = opt.utf8; > sbi->s_nocompress = opt.nocompress; > sbi->s_overriderockperm = opt.overriderockperm; > /* > diff --git a/fs/isofs/isofs.h b/fs/isofs/isofs.h > index 055ec6c586f7..dcdc191ed183 100644 > --- a/fs/isofs/isofs.h > +++ b/fs/isofs/isofs.h > @@ -44,7 +44,6 @@ struct isofs_sb_info { > unsigned char s_session; > unsigned int s_high_sierra:1; > unsigned int s_rock:2; > - unsigned int s_utf8:1; > unsigned int s_cruft:1; /* Broken disks with high byte of length > * containing junk */ > unsigned int s_nocompress:1; > diff --git a/fs/isofs/joliet.c b/fs/isofs/joliet.c > index be8b6a9d0b92..c0f04a1e7f69 100644 > --- a/fs/isofs/joliet.c > +++ b/fs/isofs/joliet.c > @@ -41,14 +41,12 @@ uni16_to_x8(unsigned char *ascii, __be16 *uni, int len, struct nls_table *nls) > int > get_joliet_filename(struct iso_directory_record * de, unsigned char *outname, struct inode * inode) > { > - unsigned char utf8; > struct nls_table *nls; > unsigned char len = 0; > > - utf8 = ISOFS_SB(inode->i_sb)->s_utf8; > nls = ISOFS_SB(inode->i_sb)->s_nls_iocharset; > > - if (utf8) { > + if (!nls) { > len = utf16s_to_utf8s((const wchar_t *) de->name, > de->name_len[0] >> 1, UTF16_BIG_ENDIAN, > outname, PAGE_SIZE); > -- > 2.20.1 > -- Jan Kara <jack@suse.com> SUSE Labs, CR
next prev parent reply other threads:[~2021-08-12 14:18 UTC|newest] Thread overview: 50+ 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 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 [this message] 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 2021-08-08 16:24 ` [RFC PATCH 13/20] hfsplus: " Pali Rohár 2021-08-09 17:42 ` Viacheslav Dubeyko 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=20210812141811.GF14675@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 \ --subject='Re: [RFC PATCH 04/20] isofs: joliet: Fix iocharset=utf8 mount option' \ /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
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).