Unverified Commit 267a36ba authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Remove noacsrules 



Currently, this option does not work properly. Its use leads to unstable results.
If we figure out how to implement it without errors, we will add it later.

Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent c20bc9c6

Documentation/filesystems/ntfs3.rst

+0 −11
Original line number Diff line number Diff line
@@ -61,17 +61,6 @@ this table marked with no it means default is without **no**. 
       directories, fmask applies only to files and dmask only to directories.

   * - fmask=



   * - 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 as successful,

	 but they will remain 777.



       - Owner/group change will be reported as successful, butthey will stay

	 as root.



   * - nohidden

     - Files with the Windows-specific HIDDEN (FILE_ATTRIBUTE_HIDDEN) attribute

       will not be shown under Linux.

fs/ntfs3/file.c

+0 −11
Original line number Diff line number Diff line
@@ -654,22 +654,12 @@ static long ntfs_fallocate(struct file *file, int mode, loff_t vbo, loff_t len) 
int ntfs3_setattr(struct mnt_idmap *idmap, struct dentry *dentry,

		  struct iattr *attr)

{

	struct super_block *sb = dentry->d_sb;

	struct ntfs_sb_info *sbi = sb->s_fs_info;

	struct inode *inode = d_inode(dentry);

	struct ntfs_inode *ni = ntfs_i(inode);

	u32 ia_valid = attr->ia_valid;

	umode_t mode = inode->i_mode;

	int err;



	if (sbi->options->noacsrules) {

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

		attr->ia_valid |= ATTR_FORCE;

		/* and disable for editing some attributes. */

		attr->ia_valid &= ~(ATTR_UID | ATTR_GID | ATTR_MODE);

		ia_valid = attr->ia_valid;

	}



	err = setattr_prepare(idmap, dentry, attr);

	if (err)

		goto out;
@@ -1153,7 +1143,6 @@ const struct inode_operations ntfs_file_inode_operations = { 
	.getattr	= ntfs_getattr,

	.setattr	= ntfs3_setattr,

	.listxattr	= ntfs_listxattr,

	.permission	= ntfs_permission,

	.get_inode_acl	= ntfs_get_acl,

	.set_acl	= ntfs_set_acl,

	.fiemap		= ntfs_fiemap,

fs/ntfs3/inode.c

+0 −1
Original line number Diff line number Diff line
@@ -2070,7 +2070,6 @@ const struct inode_operations ntfs_link_inode_operations = { 
	.get_link	= ntfs_get_link,

	.setattr	= ntfs3_setattr,

	.listxattr	= ntfs_listxattr,

	.permission	= ntfs_permission,

};



const struct address_space_operations ntfs_aops = {

fs/ntfs3/namei.c

+0 −1
Original line number Diff line number Diff line
@@ -607,7 +607,6 @@ const struct inode_operations ntfs_dir_inode_operations = { 
	.rmdir		= ntfs_rmdir,

	.mknod		= ntfs_mknod,

	.rename		= ntfs_rename,

	.permission	= ntfs_permission,

	.get_inode_acl	= ntfs_get_acl,

	.set_acl	= ntfs_set_acl,

	.setattr	= ntfs3_setattr,

fs/ntfs3/ntfs_fs.h

+0 −3
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ struct ntfs_mount_options { 
	unsigned hide_dot_files : 1; /* Set hidden flag on dot files. */

	unsigned windows_names : 1; /* Disallow names forbidden by Windows. */

	unsigned force : 1; /* RW mount dirty volume. */

	unsigned noacsrules : 1; /* Exclude acs rules. */

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

	unsigned nocase : 1; /* case insensitive. */

};
@@ -870,8 +869,6 @@ int ntfs_init_acl(struct mnt_idmap *idmap, struct inode *inode, 
#endif



int ntfs_acl_chmod(struct mnt_idmap *idmap, struct dentry *dentry);

int ntfs_permission(struct mnt_idmap *idmap, struct inode *inode,

		    int mask);

ssize_t ntfs_listxattr(struct dentry *dentry, char *buffer, size_t size);

extern const struct xattr_handler *ntfs_xattr_handlers[];