Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b280fab authored by Steve French's avatar Steve French
Browse files

[CIFS] add more complete mount options to cifs_show_options 



adds various options to cifs_show_options
(displayed when you cat /proc/mounts with a cifs mount).  I limited
the new ones to values that are associated with the mount with the
exception of "seal" (which is a per tree connection property, but I
thought was important enough to show through).

Eventually cifs's parse_mount_options also needs to
be rewritten to use the match_token API but that would be a big enough
change that I would prefer that changing parse_mount_options wait
until next release.

Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent a1fe78f1

fs/cifs/cifsfs.c

+30 −1
Original line number Diff line number Diff line 
/*

 *   fs/cifs/cifsfs.c

 *

 *   Copyright (C) International Business Machines  Corp., 2002,2007

 *   Copyright (C) International Business Machines  Corp., 2002,2008

 *   Author(s): Steve French (sfrench@us.ibm.com)

 *

 *   Common Internet FileSystem (CIFS) client
@@ -353,9 +353,38 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) 
			if ((cifs_sb->mnt_cifs_flags & CIFS_MOUNT_OVERR_GID) ||

			   !(cifs_sb->tcon->unix_ext))

				seq_printf(s, ",gid=%d", cifs_sb->mnt_gid);

			if (!cifs_sb->tcon->unix_ext) {

				seq_printf(s, ",file_mode=0%o,dir_mode=0%o",

					   cifs_sb->mnt_file_mode,

					   cifs_sb->mnt_dir_mode);

			}

			if (cifs_sb->tcon->seal)

				seq_printf(s, ",seal");

				seq_printf(s, ",nocase");

		}

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_POSIX_PATHS)

			seq_printf(s, ",posixpaths");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SET_UID)

			seq_printf(s, ",setuids");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_SERVER_INUM)

			seq_printf(s, ",serverino");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DIRECT_IO)

			seq_printf(s, ",directio");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_XATTR)

			seq_printf(s, ",nouser_xattr");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MAP_SPECIAL_CHR)

			seq_printf(s, ",mapchars");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_UNX_EMUL)

			seq_printf(s, ",sfu");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_NO_BRL)

			seq_printf(s, ",nobrl");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_CIFS_ACL)

			seq_printf(s, ",cifsacl");

		if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_DYNPERM)

			seq_printf(s, ",dynperm");

		if (m->mnt_sb->s_flags & MS_POSIXACL)

			seq_printf(s, ",acl");



		seq_printf(s, ",rsize=%d", cifs_sb->rsize);

		seq_printf(s, ",wsize=%d", cifs_sb->wsize);

	}