From 15b2ae776044ac52cddda8a3e6c9fecd15226b8c Mon Sep 17 00:00:00 2001

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

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

Subject: [Backport 15b2ae776044] src: Show uid/gid always in

 show_options()

Show options should show option according documentation when some value

is not default or when ever coder wants. Uid/gid are problematic because

it is hard to know which are defaults. In file system there is many

different implementation for this problem.

Some file systems show uid/gid when they are different than root, some

when user has set them and some show them always. There is also problem

that what if root uid/gid change. This code just choose to show them

always. This way we do not need to think this any more.

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

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

---

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

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

 2 files changed, 14 insertions(+), 21 deletions(-)

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

index 15bab48bc1ad13a9bc93d365ce92c8978635ec2b..372cda697dd4c587a82ed6381a1dd512b700d5c1 100644

--- a/src/ntfs_fs.h

+++ b/src/ntfs_fs.h

@@ -60,19 +60,16 @@ struct ntfs_mount_options {

 	u16 fs_fmask_inv;

 	u16 fs_dmask_inv;

-	unsigned uid : 1, /* uid was set. */

-		gid : 1, /* gid was set. */

-		fmask : 1, /* fmask was set. */

-		dmask : 1, /* dmask was set. */

-		sys_immutable : 1, /* Immutable system files. */

-		discard : 1, /* Issue discard requests on deletions. */

-		sparse : 1, /* Create sparse files. */

-		showmeta : 1, /* Show meta files. */

-		nohidden : 1, /* Do not show hidden files. */

-		force : 1, /* Rw mount dirty volume. */

-		noacsrules : 1, /*Exclude acs rules. */

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

-		;

+	unsigned fmask : 1; /* fmask was set. */

+	unsigned dmask : 1; /*dmask was set. */

+	unsigned sys_immutable : 1; /* Immutable system files. */

+	unsigned discard : 1; /* Issue discard requests on deletions. */

+	unsigned sparse : 1; /* Create sparse files. */

+	unsigned showmeta : 1; /* Show meta files. */

+	unsigned nohidden : 1; /* Do not show hidden files. */

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

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

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

 };

 /* Special value to unpack and deallocate. */

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

index 0690e7e4f00de4e6c89cacebdb4862bbb8f00bc6..3cba0b5e7ac72c444a55de38b791faa87732049f 100644

--- a/src/super.c

+++ b/src/super.c

@@ -294,13 +294,11 @@ static int ntfs_fs_parse_param(struct fs_context *fc,

 		opts->fs_uid = make_kuid(current_user_ns(), result.uint_32);

 		if (!uid_valid(opts->fs_uid))

 			return invalf(fc, "ntfs3: Invalid value for uid.");

-		opts->uid = 1;

 		break;

 	case Opt_gid:

 		opts->fs_gid = make_kgid(current_user_ns(), result.uint_32);

 		if (!gid_valid(opts->fs_gid))

 			return invalf(fc, "ntfs3: Invalid value for gid.");

-		opts->gid = 1;

 		break;

 	case Opt_umask:

 		if (result.uint_32 & ~07777)

@@ -521,12 +519,10 @@ static int ntfs_show_options(struct seq_file *m, struct dentry *root)

 	struct ntfs_mount_options *opts = sbi->options;

 	struct user_namespace *user_ns = seq_user_ns(m);

-	if (opts->uid)

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

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

-	if (opts->gid)

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

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

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

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

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

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

 	if (opts->fmask)

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

 	if (opts->dmask)

-- 

2.31.1