From 28a941ffc1404b66d67228cbe8392bbadb94af0d Mon Sep 17 00:00:00 2001

From: Kari Argillander <kari.argillander@gmail.com>

Date: Tue, 7 Sep 2021 18:35:56 +0300

Subject: [Backport 28a941ffc140] src: Rename mount option no_acs_rules >

 (no)acsrules

Rename mount option no_acs_rules to (no)acsrules. This allow us to use

possibility to mount with options noaclrules or aclrules.

Acked-by: Christian Brauner <christian.brauner@ubuntu.com>

Reviewed-by: Christoph Hellwig <hch@lst.de>

Signed-off-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/file.c    |  2 +-

 src/ntfs_fs.h |  2 +-

 src/super.c   | 12 ++++++------

 src/xattr.c   |  2 +-

 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/file.c b/src/file.c

index fef57141b161747101d6898b8da774a372de5cbf..0743d806c567409dd2845b6577f2ae3adf92b383 100644

--- a/src/file.c

+++ b/src/file.c

@@ -737,7 +737,7 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,

 	umode_t mode = inode->i_mode;

 	int err;

-	if (sbi->options->no_acs_rules) {

+	if (sbi->options->noacsrules) {

 		/* "No access rules" - Force any changes of time etc. */

 		attr->ia_valid |= ATTR_FORCE;

 		/* and disable for editing some attributes. */

diff --git a/src/ntfs_fs.h b/src/ntfs_fs.h

index aa18f12b7096e2ecd7e6db365aaa0152d4fb2327..15bab48bc1ad13a9bc93d365ce92c8978635ec2b 100644

--- a/src/ntfs_fs.h

+++ b/src/ntfs_fs.h

@@ -70,7 +70,7 @@ struct ntfs_mount_options {

 		showmeta : 1, /* Show meta files. */

 		nohidden : 1, /* Do not show hidden files. */

 		force : 1, /* Rw mount dirty volume. */

-		no_acs_rules : 1, /*Exclude acs rules. */

+		noacsrules : 1, /*Exclude acs rules. */

 		prealloc : 1 /* Preallocate space when file is growing. */

 		;

 };

diff --git a/src/super.c b/src/super.c

index 503e2e23f711e9c66ede31dde62ac64ca3c44f76..0690e7e4f00de4e6c89cacebdb4862bbb8f00bc6 100644

--- a/src/super.c

+++ b/src/super.c

@@ -228,7 +228,7 @@ enum Opt {

 	Opt_acl,

 	Opt_iocharset,

 	Opt_prealloc,

-	Opt_no_acs_rules,

+	Opt_noacsrules,

 	Opt_err,

 };

@@ -246,7 +246,7 @@ static const struct fs_parameter_spec ntfs_fs_parameters[] = {

 	fsparam_flag_no("acl",			Opt_acl),

 	fsparam_flag_no("showmeta",		Opt_showmeta),

 	fsparam_flag_no("prealloc",		Opt_prealloc),

-	fsparam_flag("no_acs_rules",		Opt_no_acs_rules),

+	fsparam_flag_no("acsrules",		Opt_noacsrules),

 	fsparam_string("iocharset",		Opt_iocharset),

 	__fsparam(fs_param_is_string,

@@ -358,8 +358,8 @@ static int ntfs_fs_parse_param(struct fs_context *fc,

 	case Opt_prealloc:

 		opts->prealloc = result.negated ? 0 : 1;

 		break;

-	case Opt_no_acs_rules:

-		opts->no_acs_rules = 1;

+	case Opt_noacsrules:

+		opts->noacsrules = result.negated ? 1 : 0;

 		break;

 	default:

 		/* Should not be here unless we forget add case. */

@@ -547,8 +547,8 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)

 		seq_puts(m, ",nohidden");

 	if (opts->force)

 		seq_puts(m, ",force");

-	if (opts->no_acs_rules)

-		seq_puts(m, ",no_acs_rules");

+	if (opts->noacsrules)

+		seq_puts(m, ",noacsrules");

 	if (opts->prealloc)

 		seq_puts(m, ",prealloc");

 	if (sb->s_flags & SB_POSIXACL)

diff --git a/src/xattr.c b/src/xattr.c

index ac4b37bf8832a51b9e32b7c4feb6f1c762d5b271..6f88cb77a17f666fc7cdcdcdcd44b032ceca1c07 100644

--- a/src/xattr.c

+++ b/src/xattr.c

@@ -769,7 +769,7 @@ int ntfs_acl_chmod(struct user_namespace *mnt_userns, struct inode *inode)

 int ntfs_permission(struct user_namespace *mnt_userns, struct inode *inode,

 		    int mask)

 {

-	if (ntfs_sb(inode->i_sb)->options->no_acs_rules) {

+	if (ntfs_sb(inode->i_sb)->options->noacsrules) {

 		/* "No access rules" mode - Allow all changes. */

 		return 0;

 	}

-- 

2.31.1