From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 29 Sep 2010 23:51:12 +0000 (-0400)
Subject: cifs: fix cifs_show_options to show "username=" or "multiuser"
X-Git-Tag: firefly_0821_release~7613^2~3681^2~22^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=29e07c82a9e8acebbb38ecc22b0b5005a0a5d839;p=firefly-linux-kernel-4.4.55.git

cifs: fix cifs_show_options to show "username=" or "multiuser"

...based on CIFS_MOUNT_MULTIUSER flag.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
---

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index b2fd075dc2e6..c96345c3314d 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -369,8 +369,12 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m)
 	srcaddr = (struct sockaddr *)&tcon->ses->server->srcaddr;
 
 	seq_printf(s, ",unc=%s", tcon->treeName);
-	if (tcon->ses->userName)
+
+	if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_MULTIUSER)
+		seq_printf(s, ",multiuser");
+	else if (tcon->ses->userName)
 		seq_printf(s, ",username=%s", tcon->ses->userName);
+
 	if (tcon->ses->domainName)
 		seq_printf(s, ",domain=%s", tcon->ses->domainName);