| Message ID | 20180810013110.30338-1-lsahlber@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | cifs: don't show domain= in mount output when domain is empty | expand |
merged into cifs-2.6.git for-next On Thu, Aug 9, 2018 at 8:31 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote: > > Reported-by: Xiaoli Feng <xifeng@redhat.com> > Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> > --- > fs/cifs/cifsfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c > index de16078e456b..7065426b3280 100644 > --- a/fs/cifs/cifsfs.c > +++ b/fs/cifs/cifsfs.c > @@ -432,7 +432,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root) > else if (tcon->ses->user_name) > seq_show_option(s, "username", tcon->ses->user_name); > > - if (tcon->ses->domainName) > + if (tcon->ses->domainName && tcon->ses->domainName[0] != 0) > seq_show_option(s, "domain", tcon->ses->domainName); > > if (srcaddr->sa_family != AF_UNSPEC) { > -- > 2.13.3 >
2018-08-09 19:14 GMT-07:00 Steve French <smfrench@gmail.com>: > merged into cifs-2.6.git for-next > On Thu, Aug 9, 2018 at 8:31 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote: >> >> Reported-by: Xiaoli Feng <xifeng@redhat.com> >> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> >> --- >> fs/cifs/cifsfs.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c >> index de16078e456b..7065426b3280 100644 >> --- a/fs/cifs/cifsfs.c >> +++ b/fs/cifs/cifsfs.c >> @@ -432,7 +432,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root) >> else if (tcon->ses->user_name) >> seq_show_option(s, "username", tcon->ses->user_name); >> >> - if (tcon->ses->domainName) >> + if (tcon->ses->domainName && tcon->ses->domainName[0] != 0) >> seq_show_option(s, "domain", tcon->ses->domainName); >> >> if (srcaddr->sa_family != AF_UNSPEC) { >> -- >> 2.13.3 >> > > > -- > Thanks, > > Steve Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> -- Best regards, Pavel Shilovsky
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index de16078e456b..7065426b3280 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -432,7 +432,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root) else if (tcon->ses->user_name) seq_show_option(s, "username", tcon->ses->user_name); - if (tcon->ses->domainName) + if (tcon->ses->domainName && tcon->ses->domainName[0] != 0) seq_show_option(s, "domain", tcon->ses->domainName); if (srcaddr->sa_family != AF_UNSPEC) {
Reported-by: Xiaoli Feng <xifeng@redhat.com> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> --- fs/cifs/cifsfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)