Commit 7c7ee628 authored by Ronnie Sahlberg's avatar Ronnie Sahlberg Committed by Steve French

cifs: uncomplicate printing the iocharset parameter

There is no need to load the default nls to check if the iocharset argument
was specified or not since we have it in cifs_sb->ctx
Signed-off-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 6fd4ea88
...@@ -462,18 +462,6 @@ cifs_show_cache_flavor(struct seq_file *s, struct cifs_sb_info *cifs_sb) ...@@ -462,18 +462,6 @@ cifs_show_cache_flavor(struct seq_file *s, struct cifs_sb_info *cifs_sb)
seq_puts(s, "loose"); seq_puts(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. * cifs_show_options() is for displaying mount options in /proc/mounts.
* Not all settable options are displayed but most of the important * Not all settable options are displayed but most of the important
...@@ -537,9 +525,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root) ...@@ -537,9 +525,8 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
seq_printf(s, ",file_mode=0%ho,dir_mode=0%ho", seq_printf(s, ",file_mode=0%ho,dir_mode=0%ho",
cifs_sb->ctx->file_mode, cifs_sb->ctx->file_mode,
cifs_sb->ctx->dir_mode); cifs_sb->ctx->dir_mode);
if (cifs_sb->ctx->iocharset)
cifs_show_nls(s, cifs_sb->local_nls); seq_printf(s, ",iocharset=%s", cifs_sb->ctx->iocharset);
if (tcon->seal) if (tcon->seal)
seq_puts(s, ",seal"); seq_puts(s, ",seal");
else if (tcon->ses->server->ignore_signature) else if (tcon->ses->server->ignore_signature)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment