From: "Pali Rohár" <pali@kernel.org> To: 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: [RFC PATCH 02/20] hfsplus: Add iocharset= mount option as alias for nls= Date: Sun, 8 Aug 2021 18:24:35 +0200 [thread overview] Message-ID: <20210808162453.1653-3-pali@kernel.org> (raw) In-Reply-To: <20210808162453.1653-1-pali@kernel.org> Other fs drivers are using iocharset= mount option for specifying charset. So add it also for hfsplus and mark old nls= mount option as deprecated. Signed-off-by: Pali Rohár <pali@kernel.org> --- fs/hfsplus/options.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c index 047e05c57560..a975548f6b91 100644 --- a/fs/hfsplus/options.c +++ b/fs/hfsplus/options.c @@ -23,6 +23,7 @@ enum { opt_creator, opt_type, opt_umask, opt_uid, opt_gid, opt_part, opt_session, opt_nls, + opt_iocharset, opt_nodecompose, opt_decompose, opt_barrier, opt_nobarrier, opt_force, opt_err @@ -37,6 +38,7 @@ static const match_table_t tokens = { { opt_part, "part=%u" }, { opt_session, "session=%u" }, { opt_nls, "nls=%s" }, + { opt_iocharset, "iocharset=%s" }, { opt_decompose, "decompose" }, { opt_nodecompose, "nodecompose" }, { opt_barrier, "barrier" }, @@ -166,6 +168,9 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi) } break; case opt_nls: + pr_warn("option nls= is deprecated, use iocharset=\n"); + /* fallthrough */ + case opt_iocharset: if (sbi->nls) { pr_err("unable to change nls mapping\n"); return 0; @@ -230,7 +235,7 @@ int hfsplus_show_options(struct seq_file *seq, struct dentry *root) if (sbi->session >= 0) seq_printf(seq, ",session=%u", sbi->session); if (sbi->nls) - seq_printf(seq, ",nls=%s", sbi->nls->charset); + seq_printf(seq, ",iocharset=%s", sbi->nls->charset); if (test_bit(HFSPLUS_SB_NODECOMPOSE, &sbi->flags)) seq_puts(seq, ",nodecompose"); if (test_bit(HFSPLUS_SB_NOBARRIER, &sbi->flags)) -- 2.20.1
next prev parent reply other threads:[~2021-08-08 16:25 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 ` Pali Rohár [this message] 2021-08-09 17:51 ` [RFC PATCH 02/20] hfsplus: Add iocharset= mount option as alias for nls= 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 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=20210808162453.1653-3-pali@kernel.org \ --to=pali@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=anton@tuxera.com \ --cc=hch@infradead.org \ --cc=hirofumi@mail.parknet.co.jp \ --cc=jack@suse.cz \ --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=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 02/20] hfsplus: Add iocharset= mount option as alias for nls=' \ /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).