Unverified Commit 28a941ff authored by Kari Argillander's avatar Kari Argillander Committed by Konstantin Komarov
Browse files

fs/ntfs3: 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: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKari Argillander <kari.argillander@gmail.com>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent e274cde8

Documentation/filesystems/ntfs3.rst

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ prealloc Preallocate space for files excessively when file size is 
			increasing on writes. Decreases fragmentation in case of

			parallel write operations to different files.



no_acs_rules		"No access rules" mount option sets access rights for

noacsrules		"No access rules" mount option sets access rights for

			files/folders to 777 and owner/group to root. This mount

			option absorbs all other permissions:

			- permissions change for files/folders will be reported

fs/ntfs3/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */

fs/ntfs3/ntfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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. */

		;

};

fs/ntfs3/super.c

+6 −6
Original line number Diff line number Diff line
@@ -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)

fs/ntfs3/xattr.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}