Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs/ntfs3: Rename mount option no_acs_rules > (no)acsrules

Browse Source 
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>
This commit is contained in:
Kari Argillander 2021-09-07 18:35:56 +03:00 committed by Konstantin Komarov
parent e274cde8c7
commit 28a941ffc1
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/filesystems/ntfs3.rst
View File

@ -73,7 +73,7 @@ prealloc Preallocate space for files excessively when file size is
increasing on writes. Decreases fragmentation in case of increasing on writes. Decreases fragmentation in case of
parallel write operations to different files. 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 files/folders to 777 and owner/group to root. This mount
option absorbs all other permissions: option absorbs all other permissions:
- permissions change for files/folders will be reported - permissions change for files/folders will be reported

2
fs/ntfs3/file.c
View File

@ -737,7 +737,7 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,
umode_t mode = inode->i_mode; umode_t mode = inode->i_mode;
int err; int err;
if (sbi->options->no_acs_rules) { if (sbi->options->noacsrules) {
/* "No access rules" - Force any changes of time etc. */ /* "No access rules" - Force any changes of time etc. */
attr->ia_valid |= ATTR_FORCE; attr->ia_valid |= ATTR_FORCE;
/* and disable for editing some attributes. */ /* and disable for editing some attributes. */

2
fs/ntfs3/ntfs_fs.h
View File

@ -70,7 +70,7 @@ struct ntfs_mount_options {
showmeta : 1, /* Show meta files. */ showmeta : 1, /* Show meta files. */
nohidden : 1, /* Do not show hidden files. */ nohidden : 1, /* Do not show hidden files. */
force : 1, /* Rw mount dirty volume. */ 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. */ prealloc : 1 /* Preallocate space when file is growing. */
; ;
}; };

12
fs/ntfs3/super.c
View File

@ -228,7 +228,7 @@ enum Opt {
Opt_acl, Opt_acl,
Opt_iocharset, Opt_iocharset,
Opt_prealloc, Opt_prealloc,
Opt_no_acs_rules, Opt_noacsrules,
Opt_err, Opt_err,
}; };
@ -246,7 +246,7 @@ static const struct fs_parameter_spec ntfs_fs_parameters[] = {
fsparam_flag_no("acl", Opt_acl), fsparam_flag_no("acl", Opt_acl),
fsparam_flag_no("showmeta", Opt_showmeta), fsparam_flag_no("showmeta", Opt_showmeta),
fsparam_flag_no("prealloc", Opt_prealloc), 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_string("iocharset", Opt_iocharset),
__fsparam(fs_param_is_string, __fsparam(fs_param_is_string,
@ -358,8 +358,8 @@ static int ntfs_fs_parse_param(struct fs_context *fc,
case Opt_prealloc: case Opt_prealloc:
opts->prealloc = result.negated ? 0 : 1; opts->prealloc = result.negated ? 0 : 1;
break; break;
case Opt_no_acs_rules: case Opt_noacsrules:
opts->no_acs_rules = 1; opts->noacsrules = result.negated ? 1 : 0;
break; break;
default: default:
/* Should not be here unless we forget add case. */ /* 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"); seq_puts(m, ",nohidden");
if (opts->force) if (opts->force)
seq_puts(m, ",force"); seq_puts(m, ",force");
if (opts->no_acs_rules) if (opts->noacsrules)
seq_puts(m, ",no_acs_rules"); seq_puts(m, ",noacsrules");
if (opts->prealloc) if (opts->prealloc)
seq_puts(m, ",prealloc"); seq_puts(m, ",prealloc");
if (sb->s_flags & SB_POSIXACL) if (sb->s_flags & SB_POSIXACL)

2
fs/ntfs3/xattr.c
View File

@ -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 ntfs_permission(struct user_namespace *mnt_userns, struct inode *inode,
int mask) 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. */ /* "No access rules" mode - Allow all changes. */
return 0; return 0;
} }