LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Kari Argillander <kari.argillander@gmail.com>
To: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>,
	Christoph Hellwig <hch@lst.de>
Cc: "Kari Argillander" <kari.argillander@gmail.com>,
	ntfs3@lists.linux.dev, linux-kernel@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, "Pali Rohár" <pali@kernel.org>,
	"Matthew Wilcox" <willy@infradead.org>,
	"Christian Brauner" <christian.brauner@ubuntu.com>
Subject: [PATCH v2 5/6] fs/ntfs3: Add iocharset= mount option as alias for nls=
Date: Thu, 19 Aug 2021 03:26:32 +0300	[thread overview]
Message-ID: <20210819002633.689831-6-kari.argillander@gmail.com> (raw)
In-Reply-To: <20210819002633.689831-1-kari.argillander@gmail.com>

Other fs drivers are using iocharset= mount option for specifying charset.
So add it also for ntfs3 and mark old nls= mount option as deprecated.

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>
---
 Documentation/filesystems/ntfs3.rst |  4 ++--
 fs/ntfs3/super.c                    | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Documentation/filesystems/ntfs3.rst b/Documentation/filesystems/ntfs3.rst
index af7158de6fde..ded706474825 100644
--- a/Documentation/filesystems/ntfs3.rst
+++ b/Documentation/filesystems/ntfs3.rst
@@ -32,12 +32,12 @@ generic ones.
 
 ===============================================================================
 
-nls=name		This option informs the driver how to interpret path
+iocharset=name		This option informs the driver how to interpret path
 			strings and translate them to Unicode and back. If
 			this option is not set, the default codepage will be
 			used (CONFIG_NLS_DEFAULT).
 			Examples:
-				'nls=utf8'
+				'iocharset=utf8'
 
 uid=
 gid=
diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c
index 8e86e1956486..c3c07c181f15 100644
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@ -240,7 +240,7 @@ enum Opt {
 	Opt_nohidden,
 	Opt_showmeta,
 	Opt_acl,
-	Opt_nls,
+	Opt_iocharset,
 	Opt_prealloc,
 	Opt_no_acs_rules,
 	Opt_err,
@@ -259,9 +259,13 @@ static const struct fs_parameter_spec ntfs_fs_parameters[] = {
 	fsparam_flag_no("hidden",		Opt_nohidden),
 	fsparam_flag_no("acl",			Opt_acl),
 	fsparam_flag_no("showmeta",		Opt_showmeta),
-	fsparam_string("nls",			Opt_nls),
 	fsparam_flag_no("prealloc",		Opt_prealloc),
 	fsparam_flag("no_acs_rules",		Opt_no_acs_rules),
+	fsparam_string("iocharset",		Opt_iocharset),
+
+	__fsparam(fs_param_is_string,
+		  "nls", Opt_iocharset,
+		  fs_param_deprecated, NULL),
 	{}
 };
 
@@ -332,7 +336,7 @@ static int ntfs_fs_parse_param(struct fs_context *fc,
 	case Opt_showmeta:
 		opts->showmeta = result.negated ? 0 : 1;
 		break;
-	case Opt_nls:
+	case Opt_iocharset:
 		opts->nls_name = param->string;
 		param->string = NULL;
 		break;
@@ -519,7 +523,7 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)
 	if (opts->dmask)
 		seq_printf(m, ",dmask=%04o", ~opts->fs_dmask_inv);
 	if (opts->nls_name)
-		seq_printf(m, ",nls=%s", opts->nls_name);
+		seq_printf(m, ",iocharset=%s", opts->nls_name);
 	if (opts->sys_immutable)
 		seq_puts(m, ",sys_immutable");
 	if (opts->discard)
-- 
2.25.1


  parent reply	other threads:[~2021-08-19  0:27 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19  0:26 [PATCH v2 0/6] fs/ntfs3: Use new mount api and change some opts Kari Argillander
2021-08-19  0:26 ` [PATCH v2 1/6] fs/ntfs3: Remove unnecesarry mount option noatime Kari Argillander
2021-08-24  7:58   ` Christoph Hellwig
2021-08-24 11:17   ` Christian Brauner
2021-08-19  0:26 ` [PATCH v2 2/6] fs/ntfs3: Remove unnecesarry remount flag handling Kari Argillander
2021-08-24  7:59   ` Christoph Hellwig
2021-08-24 11:17   ` Christian Brauner
2021-08-19  0:26 ` [PATCH v2 3/6] fs/ntfs3: Use new api for mounting Kari Argillander
2021-08-19  8:18   ` Pali Rohár
2021-08-19 10:01     ` Kari Argillander
2021-08-19 21:53   ` Kari Argillander
2021-08-24  8:03   ` Christoph Hellwig
2021-08-24  8:21     ` Kari Argillander
2021-08-27 18:44       ` Konstantin Komarov
2021-08-24 11:32   ` Christian Brauner
2021-08-24 14:13     ` Kari Argillander
2021-08-19  0:26 ` [PATCH v2 4/6] fs/ntfs3: Make mount option nohidden more universal Kari Argillander
2021-08-24  8:03   ` Christoph Hellwig
2021-08-24 11:16   ` Christian Brauner
2021-08-19  0:26 ` Kari Argillander [this message]
2021-08-19  8:26   ` [PATCH v2 5/6] fs/ntfs3: Add iocharset= mount option as alias for nls= Pali Rohár
2021-08-19  9:45     ` Kari Argillander
2021-08-19  9:55       ` Pali Rohár
2021-08-19  0:26 ` [PATCH v2 6/6] fs/ntfs3: Rename mount option no_acl_rules > (no)acl_rules Kari Argillander
2021-08-24  8:03   ` Christoph Hellwig
2021-08-24 11:15   ` Christian Brauner

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=20210819002633.689831-6-kari.argillander@gmail.com \
    --to=kari.argillander@gmail.com \
    --cc=almaz.alexandrovich@paragon-software.com \
    --cc=christian.brauner@ubuntu.com \
    --cc=hch@lst.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ntfs3@lists.linux.dev \
    --cc=pali@kernel.org \
    --cc=willy@infradead.org \
    --subject='Re: [PATCH v2 5/6] fs/ntfs3: 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).