Unverified Commit 15b2ae77 authored by Kari Argillander's avatar Kari Argillander Committed by Konstantin Komarov
Browse files

fs/ntfs3: 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: default avatarKari Argillander <kari.argillander@gmail.com>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 28a941ff

fs/ntfs3/ntfs_fs.h

+10 −13
Original line number Diff line number Diff line
@@ -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. */

fs/ntfs3/super.c

+4 −8
Original line number Diff line number Diff line
@@ -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,10 +519,8 @@ 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));

	if (opts->fmask)