From 8a80b8c6acb10a4659ed0566d7de3ab883ed5a31 Mon Sep 17 00:00:00 2001

From: Peter Georg <peter.georg@physik.uni-regensburg.de>

Date: Mon, 18 Oct 2021 16:44:57 +0200

Subject: [PATCH 9001/9005] Remove idmap mount support

---

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

 src/inode.c   |  6 +++---

 src/namei.c   | 18 +++++++++---------

 src/ntfs_fs.h | 14 +++++++-------

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

 src/xattr.c   | 31 +++++++++++++++----------------

 6 files changed, 43 insertions(+), 45 deletions(-)

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

index 43b1451..ee9a472 100644

--- a/src/file.c

+++ b/src/file.c

@@ -69,7 +69,7 @@ static long ntfs_compat_ioctl(struct file *filp, u32 cmd, unsigned long arg)

 /*

  * ntfs_getattr - inode_operations::getattr

  */

-int ntfs_getattr(struct user_namespace *mnt_userns, const struct path *path,

+int ntfs_getattr(const struct path *path,

 		 struct kstat *stat, u32 request_mask, u32 flags)

 {

 	struct inode *inode = d_inode(path->dentry);

@@ -83,7 +83,7 @@ int ntfs_getattr(struct user_namespace *mnt_userns, const struct path *path,

 	stat->attributes_mask |= STATX_ATTR_COMPRESSED | STATX_ATTR_ENCRYPTED;

-	generic_fillattr(mnt_userns, inode, stat);

+	generic_fillattr(inode, stat);

 	stat->result_mask |= STATX_BTIME;

 	stat->btime = ni->i_crtime;

@@ -728,7 +728,7 @@ out:

 /*

  * ntfs3_setattr - inode_operations::setattr

  */

-int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,

+int ntfs3_setattr(struct dentry *dentry,

 		  struct iattr *attr)

 {

 	struct super_block *sb = dentry->d_sb;

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

 		ia_valid = attr->ia_valid;

 	}

-	err = setattr_prepare(mnt_userns, dentry, attr);

+	err = setattr_prepare(dentry, attr);

 	if (err)

 		goto out;

@@ -772,10 +772,10 @@ int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,

 		ni->ni_flags |= NI_FLAG_UPDATE_PARENT;

 	}

-	setattr_copy(mnt_userns, inode, attr);

+	setattr_copy(inode, attr);

 	if (mode != inode->i_mode) {

-		err = ntfs_acl_chmod(mnt_userns, inode);

+		err = ntfs_acl_chmod(inode);

 		if (err)

 			goto out;

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

index 859951d..69eef0f 100644

--- a/src/inode.c

+++ b/src/inode.c

@@ -1163,7 +1163,7 @@ out:

 	return ERR_PTR(err);

 }

-struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,

+struct inode *ntfs_create_inode(

 				struct inode *dir, struct dentry *dentry,

 				const struct cpu_str *uni, umode_t mode,

 				dev_t dev, const char *symname, u32 size,

@@ -1280,7 +1280,7 @@ struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,

 		goto out3;

 	}

 	inode = &ni->vfs_inode;

-	inode_init_owner(mnt_userns, inode, dir, mode);

+	inode_init_owner(inode, dir, mode);

 	mode = inode->i_mode;

 	inode->i_atime = inode->i_mtime = inode->i_ctime = ni->i_crtime =

@@ -1579,7 +1579,7 @@ struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,

 #ifdef CONFIG_NTFS3_FS_POSIX_ACL

 	if (!S_ISLNK(mode) && (sb->s_flags & SB_POSIXACL)) {

-		err = ntfs_init_acl(mnt_userns, inode, dir);

+		err = ntfs_init_acl(inode, dir);

 		if (err)

 			goto out7;

 	} else

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

index bc74121..7e346b8 100644

--- a/src/namei.c

+++ b/src/namei.c

@@ -92,12 +92,12 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,

 /*

  * ntfs_create - inode_operations::create

  */

-static int ntfs_create(struct user_namespace *mnt_userns, struct inode *dir,

+static int ntfs_create(struct inode *dir,

 		       struct dentry *dentry, umode_t mode, bool excl)

 {

 	struct inode *inode;

-	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFREG | mode,

+	inode = ntfs_create_inode(dir, dentry, NULL, S_IFREG | mode,

 				  0, NULL, 0, NULL);

 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

@@ -108,12 +108,12 @@ static int ntfs_create(struct user_namespace *mnt_userns, struct inode *dir,

  *

  * inode_operations::mknod

  */

-static int ntfs_mknod(struct user_namespace *mnt_userns, struct inode *dir,

+static int ntfs_mknod(struct inode *dir,

 		      struct dentry *dentry, umode_t mode, dev_t rdev)

 {

 	struct inode *inode;

-	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, mode, rdev,

+	inode = ntfs_create_inode(dir, dentry, NULL, mode, rdev,

 				  NULL, 0, NULL);

 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

@@ -181,13 +181,13 @@ static int ntfs_unlink(struct inode *dir, struct dentry *dentry)

 /*

  * ntfs_symlink - inode_operations::symlink

  */

-static int ntfs_symlink(struct user_namespace *mnt_userns, struct inode *dir,

+static int ntfs_symlink(struct inode *dir,

 			struct dentry *dentry, const char *symname)

 {

 	u32 size = strlen(symname);

 	struct inode *inode;

-	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFLNK | 0777,

+	inode = ntfs_create_inode(dir, dentry, NULL, S_IFLNK | 0777,

 				  0, symname, size, NULL);

 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

@@ -196,12 +196,12 @@ static int ntfs_symlink(struct user_namespace *mnt_userns, struct inode *dir,

 /*

  * ntfs_mkdir- inode_operations::mkdir

  */

-static int ntfs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,

+static int ntfs_mkdir(struct inode *dir,

 		      struct dentry *dentry, umode_t mode)

 {

 	struct inode *inode;

-	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFDIR | mode,

+	inode = ntfs_create_inode(dir, dentry, NULL, S_IFDIR | mode,

 				  0, NULL, 0, NULL);

 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

@@ -227,7 +227,7 @@ static int ntfs_rmdir(struct inode *dir, struct dentry *dentry)

 /*

  * ntfs_rename - inode_operations::rename

  */

-static int ntfs_rename(struct user_namespace *mnt_userns, struct inode *dir,

+static int ntfs_rename(struct inode *dir,

 		       struct dentry *dentry, struct inode *new_dir,

 		       struct dentry *new_dentry, u32 flags)

 {

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

index 8aaec7e..040fa56 100644

--- a/src/ntfs_fs.h

+++ b/src/ntfs_fs.h

@@ -486,11 +486,11 @@ bool dir_is_empty(struct inode *dir);

 extern const struct file_operations ntfs_dir_operations;

 /* Globals from file.c */

-int ntfs_getattr(struct user_namespace *mnt_userns, const struct path *path,

+int ntfs_getattr(const struct path *path,

 		 struct kstat *stat, u32 request_mask, u32 flags);

 void ntfs_sparse_cluster(struct inode *inode, struct page *page0, CLST vcn,

 			 CLST len);

-int ntfs3_setattr(struct user_namespace *mnt_userns, struct dentry *dentry,

+int ntfs3_setattr(struct dentry *dentry,

 		  struct iattr *attr);

 int ntfs_file_open(struct inode *inode, struct file *file);

 int ntfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,

@@ -695,7 +695,7 @@ int ntfs_sync_inode(struct inode *inode);

 int ntfs_flush_inodes(struct super_block *sb, struct inode *i1,

 		      struct inode *i2);

 int inode_write_data(struct inode *inode, const void *data, size_t bytes);

-struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,

+struct inode *ntfs_create_inode(

 				struct inode *dir, struct dentry *dentry,

 				const struct cpu_str *uni, umode_t mode,

 				dev_t dev, const char *symname, u32 size,

@@ -837,17 +837,17 @@ int ntfs_cmp_names_cpu(const struct cpu_str *uni1, const struct le_str *uni2,

 /* globals from xattr.c */

 #ifdef CONFIG_NTFS3_FS_POSIX_ACL

 struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu);

-int ntfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,

+int ntfs_set_acl(struct inode *inode,

 		 struct posix_acl *acl, int type);

-int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,

+int ntfs_init_acl(struct inode *inode,

 		  struct inode *dir);

 #else

 #define ntfs_get_acl NULL

 #define ntfs_set_acl NULL

 #endif

-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_acl_chmod(struct inode *inode);

+int ntfs_permission(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[];

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

index d41d769..97cfd3f 100644

--- a/src/super.c

+++ b/src/super.c

@@ -511,12 +511,11 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)

 	struct super_block *sb = root->d_sb;

 	struct ntfs_sb_info *sbi = sb->s_fs_info;

 	struct ntfs_mount_options *opts = sbi->options;

-	struct user_namespace *user_ns = seq_user_ns(m);

 	seq_printf(m, ",uid=%u",

-		  from_kuid_munged(user_ns, opts->fs_uid));

+		  from_kuid_munged(&init_user_ns, opts->fs_uid));

 	seq_printf(m, ",gid=%u",

-		  from_kgid_munged(user_ns, opts->fs_gid));

+		  from_kgid_munged(&init_user_ns, opts->fs_gid));

 	if (opts->fmask)

 		seq_printf(m, ",fmask=%04o", ~opts->fs_fmask_inv);

 	if (opts->dmask)

@@ -1435,7 +1434,7 @@ static struct file_system_type ntfs_fs_type = {

 	.init_fs_context	= ntfs_init_fs_context,

 	.parameters		= ntfs_fs_parameters,

 	.kill_sb		= kill_block_super,

-	.fs_flags		= FS_REQUIRES_DEV | FS_ALLOW_IDMAP,

+	.fs_flags		= FS_REQUIRES_DEV,

 };

 // clang-format on

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

index afd0dda..110fecb 100644

--- a/src/xattr.c

+++ b/src/xattr.c

@@ -476,7 +476,7 @@ out:

 }

 #ifdef CONFIG_NTFS3_FS_POSIX_ACL

-static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns,

+static struct posix_acl *ntfs_get_acl_ex(

 					 struct inode *inode, int type,

 					 int locked)

 {

@@ -512,7 +512,7 @@ static struct posix_acl *ntfs_get_acl_ex(struct user_namespace *mnt_userns,

 	/* Translate extended attribute to acl. */

 	if (err >= 0) {

-		acl = posix_acl_from_xattr(mnt_userns, buf, err);

+		acl = posix_acl_from_xattr(&init_user_ns, buf, err);

 	} else if (err == -ENODATA) {

 		acl = NULL;

 	} else {

@@ -536,10 +536,10 @@ struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu)

 		return ERR_PTR(-ECHILD);

 	/* TODO: init_user_ns? */

-	return ntfs_get_acl_ex(&init_user_ns, inode, type, 0);

+	return ntfs_get_acl_ex(inode, type, 0);

 }

-static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,

+static noinline int ntfs_set_acl_ex(

 				    struct inode *inode, struct posix_acl *acl,

 				    int type)

 {

@@ -557,7 +557,7 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,

 		if (acl) {

 			umode_t mode = inode->i_mode;

-			err = posix_acl_update_mode(mnt_userns, inode, &mode,

+			err = posix_acl_update_mode(inode, &mode,

 						    &acl;;

 			if (err)

 				goto out;

@@ -592,7 +592,7 @@ static noinline int ntfs_set_acl_ex(struct user_namespace *mnt_userns,

 		value = kmalloc(size, GFP_NOFS);

 		if (!value)

 			return -ENOMEM;

-		err = posix_acl_to_xattr(mnt_userns, acl, value, size);

+		err = posix_acl_to_xattr(&init_user_ns, acl, value, size);

 		if (err < 0)

 			goto out;

 		flags = 0;

@@ -613,10 +613,10 @@ out:

 /*

  * ntfs_set_acl - inode_operations::set_acl

  */

-int ntfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,

+int ntfs_set_acl(struct inode *inode,

 		 struct posix_acl *acl, int type)

 {

-	return ntfs_set_acl_ex(mnt_userns, inode, acl, type);

+	return ntfs_set_acl_ex(inode, acl, type);

 }

 /*

@@ -624,7 +624,7 @@ int ntfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,

  *

  * Called from ntfs_create_inode().

  */

-int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,

+int ntfs_init_acl(struct inode *inode,

 		  struct inode *dir)

 {

 	struct posix_acl *default_acl, *acl;

@@ -635,7 +635,7 @@ int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,

 		return err;

 	if (default_acl) {

-		err = ntfs_set_acl_ex(mnt_userns, inode, default_acl,

+		err = ntfs_set_acl_ex(inode, default_acl,

 				      ACL_TYPE_DEFAULT);

 		posix_acl_release(default_acl);

 	} else {

@@ -646,7 +646,7 @@ int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,

 		inode->i_acl = NULL;

 	else {

 		if (!err)

-			err = ntfs_set_acl_ex(mnt_userns, inode, acl,

+			err = ntfs_set_acl_ex(inode, acl,

 					      ACL_TYPE_ACCESS);

 		posix_acl_release(acl);

 	}

@@ -658,7 +658,7 @@ int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,

 /*

  * ntfs_acl_chmod - Helper for ntfs3_setattr().

  */

-int ntfs_acl_chmod(struct user_namespace *mnt_userns, struct inode *inode)

+int ntfs_acl_chmod(struct inode *inode)

 {

 	struct super_block *sb = inode->i_sb;

@@ -668,13 +668,13 @@ int ntfs_acl_chmod(struct user_namespace *mnt_userns, struct inode *inode)

 	if (S_ISLNK(inode->i_mode))

 		return -EOPNOTSUPP;

-	return posix_acl_chmod(mnt_userns, inode, inode->i_mode);

+	return posix_acl_chmod(inode, inode->i_mode);

 }

 /*

  * ntfs_permission - inode_operations::permission

  */

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

+int ntfs_permission(struct inode *inode,

 		    int mask)

 {

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

@@ -682,7 +682,7 @@ int ntfs_permission(struct user_namespace *mnt_userns, struct inode *inode,

 		return 0;

 	}

-	return generic_permission(mnt_userns, inode, mask);

+	return generic_permission(inode, mask);

 }

 /*

@@ -796,7 +796,6 @@ out:

  * ntfs_setxattr - inode_operations::setxattr

  */

 static noinline int ntfs_setxattr(const struct xattr_handler *handler,

-				  struct user_namespace *mnt_userns,

 				  struct dentry *de, struct inode *inode,

 				  const char *name, const void *value,

 				  size_t size, int flags)

-- 

2.31.1