From patchwork Fri Aug 20 19:32:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 120685 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7KJXFre020323 for ; Fri, 20 Aug 2010 19:33:15 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752910Ab0HTTdP (ORCPT ); Fri, 20 Aug 2010 15:33:15 -0400 Received: from cdptpa-omtalb.mail.rr.com ([75.180.132.120]:33409 "EHLO cdptpa-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751616Ab0HTTdO (ORCPT ); Fri, 20 Aug 2010 15:33:14 -0400 X-Authority-Analysis: v=1.1 cv=ND68juEMuNdXz64+ywFdFni4U2KLqWwWKyn0dKsYuqk= c=1 sm=0 a=NZC_KCoMzkkA:10 a=ld/erqUjW76FpBUqCqkKeA==:17 a=20KFwNOVAAAA:8 a=UnRUED1hamcKw5Ded78A:9 a=Yze5xQwYHzTih4kInGaAolr_rz8A:4 a=jEp0ucaQiEUA:10 a=ld/erqUjW76FpBUqCqkKeA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 71.70.153.3 Received: from [71.70.153.3] ([71.70.153.3:55301] helo=mail.poochiereds.net) by cdptpa-oedge02.mail.rr.com (envelope-from ) (ecelerity 2.2.2.39 r()) with ESMTP id 83/C8-19911-C38DE6C4; Fri, 20 Aug 2010 19:32:13 +0000 Received: by mail.poochiereds.net (Postfix, from userid 4447) id 105A358150; Fri, 20 Aug 2010 15:32:12 -0400 (EDT) From: Jeff Layton To: linux-cifs@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org Subject: [PATCH 12/15] cifs: fix cifs_show_options to show "username=" or "multiuser" Date: Fri, 20 Aug 2010 15:32:08 -0400 Message-Id: <1282332731-17444-13-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.2.1 In-Reply-To: <1282332731-17444-1-git-send-email-jlayton@redhat.com> References: <1282332731-17444-1-git-send-email-jlayton@redhat.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 20 Aug 2010 19:33:15 +0000 (UTC) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index c6b8776..eea0897 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -368,8 +368,12 @@ cifs_show_options(struct seq_file *s, struct vfsmount *m) struct cifsTconInfo *tcon = cifs_sb_master_tcon(cifs_sb); 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);