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

Commit 3ae35cde authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: display iocharset= option in /proc/mounts 



...but only if it's not the default charset.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <smfrench@gmail.com>
parent 30706a54

fs/cifs/cifsfs.c

+15 −0
Original line number Diff line number Diff line
@@ -357,6 +357,18 @@ cifs_show_cache_flavor(struct seq_file *s, struct cifs_sb_info *cifs_sb) 
		seq_printf(s, "loose");

}



static void

cifs_show_nls(struct seq_file *s, struct nls_table *cur)

{

	struct nls_table *def;



	/* Display iocharset= option if it's not default charset */

	def = load_nls_default();

	if (def != cur)

		seq_printf(s, ",iocharset=%s", cur->charset);

	unload_nls(def);

}



/*

 * cifs_show_options() is for displaying mount options in /proc/mounts.

 * Not all settable options are displayed but most of the important
@@ -418,6 +430,9 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
		seq_printf(s, ",file_mode=0%ho,dir_mode=0%ho",

					   cifs_sb->mnt_file_mode,

					   cifs_sb->mnt_dir_mode);



	cifs_show_nls(s, cifs_sb->local_nls);



	if (tcon->seal)

		seq_printf(s, ",seal");

	if (tcon->nocase)