summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorSteve French <smfrench@gmail.com>2015-09-11 19:24:19 -0500
committerSteve French <smfrench@gmail.com>2015-09-11 19:37:06 -0500
commiteda2116f4ab6d79cfcffc202b5d2bbb0797ba013 (patch)
tree40566259b44da57ba468c532998bd51b05a79ea0 /fs
parent4c17a6d56bb0cad3066a714e94f7185a24b40f49 (diff)
downloadlinux-eda2116f4ab6d79cfcffc202b5d2bbb0797ba013.tar.bz2
[CIFS] mount option sec=none not displayed properly in /proc/mounts
When the user specifies "sec=none" in a cifs mount, we set sec_type as unspecified (and set a flag and the username will be null) rather than setting sectype as "none" so cifs_show_security was not properly displaying it in cifs /proc/mounts entries. Signed-off-by: Steve French <steve.french@primarydata.com> Reviewed-by: Jeff Layton <jlayton@poochiereds.net>
Diffstat (limited to 'fs')
-rw-r--r--fs/cifs/cifsfs.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 6a1119e87fbb..e739950ca084 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -325,8 +325,11 @@ cifs_show_address(struct seq_file *s, struct TCP_Server_Info *server)
static void
cifs_show_security(struct seq_file *s, struct cifs_ses *ses)
{
- if (ses->sectype == Unspecified)
+ if (ses->sectype == Unspecified) {
+ if (ses->user_name == NULL)
+ seq_puts(s, ",sec=none");
return;
+ }
seq_puts(s, ",sec=");