From 564c97bdfa39c7d1f331841fb24da6e714693037 Mon Sep 17 00:00:00 2001

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

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

Subject: [Backport 564c97bdfa39] src: Convert mount options to pointer in

 sbi

Use pointer to mount options. We want to do this because we will use new

mount api which will benefit that we have spi and mount options in

different allocations. When we remount we do not have to make whole new

spi it is enough that we will allocate just mount options.

Please note that we can do example remount lot cleaner but things will

change in next patch so this should be just functional.

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

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

---

 src/attrib.c  |  2 +-

 src/dir.c     |  8 ++++----

 src/file.c    |  4 ++--

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

 src/ntfs_fs.h |  2 +-

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

 src/xattr.c   |  2 +-

 7 files changed, 34 insertions(+), 27 deletions(-)

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

index 34c4cbf7e29bc49bdb3fa060fd2c235c3fb68536..b1055b284c60323168be99ce69b18e7dbd7bb969 100644

--- a/src/attrib.c

+++ b/src/attrib.c

@@ -529,7 +529,7 @@ int attr_set_size(struct ntfs_inode *ni, enum ATTR_TYPE type,

 		} else if (pre_alloc == -1) {

 			pre_alloc = 0;

 			if (type == ATTR_DATA && !name_len &&

-			    sbi->options.prealloc) {

+			    sbi->options->prealloc) {

 				CLST new_alen2 = bytes_to_cluster(

 					sbi, get_pre_allocated(new_size));

 				pre_alloc = new_alen2 - new_alen;

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

index 93f6d485564e0103e56ad417f184f1ace0926eea..40440df021eff2a95a87ff7a2af38345a7c40793 100644

--- a/src/dir.c

+++ b/src/dir.c

@@ -24,7 +24,7 @@ int ntfs_utf16_to_nls(struct ntfs_sb_info *sbi, const struct le_str *uni,

 	int ret, uni_len, warn;

 	const __le16 *ip;

 	u8 *op;

-	struct nls_table *nls = sbi->options.nls;

+	struct nls_table *nls = sbi->options->nls;

 	static_assert(sizeof(wchar_t) == sizeof(__le16));

@@ -186,7 +186,7 @@ int ntfs_nls_to_utf16(struct ntfs_sb_info *sbi, const u8 *name, u32 name_len,

 {

 	int ret, slen;

 	const u8 *end;

-	struct nls_table *nls = sbi->options.nls;

+	struct nls_table *nls = sbi->options->nls;

 	u16 *uname = uni->name;

 	static_assert(sizeof(wchar_t) == sizeof(u16));

@@ -301,10 +301,10 @@ static inline int ntfs_filldir(struct ntfs_sb_info *sbi, struct ntfs_inode *ni,

 		return 0;

 	/* Skip meta files. Unless option to show metafiles is set. */

-	if (!sbi->options.showmeta && ntfs_is_meta_file(sbi, ino))

+	if (!sbi->options->showmeta && ntfs_is_meta_file(sbi, ino))

 		return 0;

-	if (sbi->options.nohidden && (fname->dup.fa & FILE_ATTRIBUTE_HIDDEN))

+	if (sbi->options->nohidden && (fname->dup.fa & FILE_ATTRIBUTE_HIDDEN))

 		return 0;

 	name_len = ntfs_utf16_to_nls(sbi, (struct le_str *)&fname->name_len,

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

index 424450e77ad52ae550e8de444dc393411d97cde6..fef57141b161747101d6898b8da774a372de5cbf 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->no_acs_rules) {

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

 		attr->ia_valid |= ATTR_FORCE;

 		/* and disable for editing some attributes. */

@@ -1185,7 +1185,7 @@ static int ntfs_file_release(struct inode *inode, struct file *file)

 	int err = 0;

 	/* If we are last writer on the inode, drop the block reservation. */

-	if (sbi->options.prealloc && ((file->f_mode & FMODE_WRITE) &&

+	if (sbi->options->prealloc && ((file->f_mode & FMODE_WRITE) &&

 				      atomic_read(&inode->i_writecount) == 1)) {

 		ni_lock(ni);

 		down_write(&ni->file.run_lock);

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

index db2a5a4c38e4d62abfb2c7ca16947cd766982b13..9f740fd301b24f2b1a67da0b78d091b3a3ae4705 100644

--- a/src/inode.c

+++ b/src/inode.c

@@ -49,8 +49,8 @@ static struct inode *ntfs_read_mft(struct inode *inode,

 	inode->i_op = NULL;

 	/* Setup 'uid' and 'gid' */

-	inode->i_uid = sbi->options.fs_uid;

-	inode->i_gid = sbi->options.fs_gid;

+	inode->i_uid = sbi->options->fs_uid;

+	inode->i_gid = sbi->options->fs_gid;

 	err = mi_init(&ni->mi, sbi, ino);

 	if (err)

@@ -229,7 +229,7 @@ static struct inode *ntfs_read_mft(struct inode *inode,

 			t32 = le16_to_cpu(attr->nres.run_off);

 		}

-		mode = S_IFREG | (0777 & sbi->options.fs_fmask_inv);

+		mode = S_IFREG | (0777 & sbi->options->fs_fmask_inv);

 		if (!attr->non_res) {

 			ni->ni_flags |= NI_FLAG_RESIDENT;

@@ -272,7 +272,7 @@ static struct inode *ntfs_read_mft(struct inode *inode,

 			goto out;

 		mode = sb->s_root

-			       ? (S_IFDIR | (0777 & sbi->options.fs_dmask_inv))

+			       ? (S_IFDIR | (0777 & sbi->options->fs_dmask_inv))

 			       : (S_IFDIR | 0777);

 		goto next_attr;

@@ -443,7 +443,7 @@ static struct inode *ntfs_read_mft(struct inode *inode,

 		goto out;

 	}

-	if ((sbi->options.sys_immutable &&

+	if ((sbi->options->sys_immutable &&

 	     (std5->fa & FILE_ATTRIBUTE_SYSTEM)) &&

 	    !S_ISFIFO(mode) && !S_ISSOCK(mode) && !S_ISLNK(mode)) {

 		inode->i_flags |= S_IMMUTABLE;

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

 		 *	}

 		 */

 	} else if (S_ISREG(mode)) {

-		if (sbi->options.sparse) {

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

 			/* Sparsed regular file, cause option 'sparse'. */

 			fa = FILE_ATTRIBUTE_SPARSE_FILE |

 			     FILE_ATTRIBUTE_ARCHIVE;

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

index 97e682ebcfb94dd1ad9677ed5ee82bb6a88401a5..98c90c399ee2f447f3ad5f0847c56ca7561f17fb 100644

--- a/src/ntfs_fs.h

+++ b/src/ntfs_fs.h

@@ -279,7 +279,7 @@ struct ntfs_sb_info {

 #endif

 	} compress;

-	struct ntfs_mount_options options;

+	struct ntfs_mount_options *options;

 	struct ratelimit_state msg_ratelimit;

 };

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

index 6cb689605089e2a592143a2b4154a97211f39c6c..0f38203420515b6386bdd51e83c402c431743946 100644

--- a/src/super.c

+++ b/src/super.c

@@ -389,11 +389,11 @@ static int ntfs_remount(struct super_block *sb, int *flags, char *data)

 		return -ENOMEM;

 	/* Store  original options. */

-	memcpy(&old_opts, &sbi->options, sizeof(old_opts));

-	clear_mount_options(&sbi->options);

-	memset(&sbi->options, 0, sizeof(sbi->options));

+	memcpy(&old_opts, sbi->options, sizeof(old_opts));

+	clear_mount_options(sbi->options);

+	memset(sbi->options, 0, sizeof(old_opts));

-	err = ntfs_parse_options(sb, data, 0, &sbi->options);

+	err = ntfs_parse_options(sb, data, 0, sbi->options);

 	if (err)

 		goto restore_opts;

@@ -409,7 +409,7 @@ static int ntfs_remount(struct super_block *sb, int *flags, char *data)

 	sync_filesystem(sb);

 	if (ro_rw && (sbi->volume.flags & VOLUME_FLAG_DIRTY) &&

-	    !sbi->options.force) {

+	    !sbi->options->force) {

 		ntfs_warn(sb, "volume is dirty and \"force\" flag is not set!");

 		err = -EINVAL;

 		goto restore_opts;

@@ -422,8 +422,8 @@ static int ntfs_remount(struct super_block *sb, int *flags, char *data)

 	goto out;

 restore_opts:

-	clear_mount_options(&sbi->options);

-	memcpy(&sbi->options, &old_opts, sizeof(old_opts));

+	clear_mount_options(sbi->options);

+	memcpy(sbi->options, &old_opts, sizeof(old_opts));

 out:

 	kfree(orig_data);

@@ -506,7 +506,8 @@ static noinline void put_ntfs(struct ntfs_sb_info *sbi)

 	xpress_free_decompressor(sbi->compress.xpress);

 	lzx_free_decompressor(sbi->compress.lzx);

 #endif

-	clear_mount_options(&sbi->options);

+	clear_mount_options(sbi->options);

+	kfree(sbi->options);

 	kfree(sbi);

 }

@@ -545,7 +546,7 @@ 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 ntfs_mount_options *opts = sbi->options;

 	struct user_namespace *user_ns = seq_user_ns(m);

 	if (opts->uid)

@@ -930,6 +931,12 @@ static int ntfs_fill_super(struct super_block *sb, void *data, int silent)

 	if (!sbi)

 		return -ENOMEM;

+	sbi->options = kzalloc(sizeof(struct ntfs_mount_options), GFP_NOFS);

+	if (!sbi->options) {

+		kfree(sbi);

+		return -ENOMEM;

+	}

+

 	sb->s_fs_info = sbi;

 	sbi->sb = sb;

 	sb->s_flags |= SB_NODIRATIME;

@@ -942,7 +949,7 @@ static int ntfs_fill_super(struct super_block *sb, void *data, int silent)

 	ratelimit_state_init(&sbi->msg_ratelimit, DEFAULT_RATELIMIT_INTERVAL,

 			     DEFAULT_RATELIMIT_BURST);

-	err = ntfs_parse_options(sb, data, silent, &sbi->options);

+	err = ntfs_parse_options(sb, data, silent, sbi->options);

 	if (err)

 		goto out;

@@ -1074,7 +1081,7 @@ static int ntfs_fill_super(struct super_block *sb, void *data, int silent)

 			goto out;

 		}

 	} else if (sbi->volume.flags & VOLUME_FLAG_DIRTY) {

-		if (!is_ro && !sbi->options.force) {

+		if (!is_ro && !sbi->options->force) {

 			ntfs_warn(

 				sb,

 				"volume is dirty and \"force\" flag is not set!");

@@ -1394,7 +1401,7 @@ int ntfs_discard(struct ntfs_sb_info *sbi, CLST lcn, CLST len)

 	if (sbi->flags & NTFS_FLAGS_NODISCARD)

 		return -EOPNOTSUPP;

-	if (!sbi->options.discard)

+	if (!sbi->options->discard)

 		return -EOPNOTSUPP;

 	lbo = (u64)lcn << sbi->cluster_bits;

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

index b15d532e4a17087b06284d82965c21224f1d4f35..ac4b37bf8832a51b9e32b7c4feb6f1c762d5b271 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->no_acs_rules) {

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

 		return 0;

 	}

-- 

2.31.1