cifs: show 'soft' in the mount options for !hard mounts

Message ID 20170920030923.23453-1-lsahlber@redhat.com
State New
Headers show
Series
  • cifs: show 'soft' in the mount options for !hard mounts
Related show

Commit Message

Leif Sahlberg Sept. 20, 2017, 3:09 a.m.
Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
 fs/cifs/cifsfs.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Leif Sahlberg Sept. 20, 2017, 3:24 a.m. | #1
No option on stable.

It is a trivial but purely cosmetic patch.  Probably not worth the effort to post to stable.


----- Original Message -----
From: "Steve French" <smfrench@gmail.com>
To: "Ronnie Sahlberg" <lsahlber@redhat.com>
Cc: "linux-cifs" <linux-cifs@vger.kernel.org>
Sent: Wednesday, 20 September, 2017 1:22:11 PM
Subject: Re: [PATCH] cifs: show 'soft' in the mount options for !hard mounts

Opinions on stable?

On Sep 19, 2017 8:09 PM, "Ronnie Sahlberg" <lsahlber@redhat.com> wrote:

> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
>  fs/cifs/cifsfs.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
> index 180b3356ff86..a864e6575309 100644
> --- a/fs/cifs/cifsfs.c
> +++ b/fs/cifs/cifsfs.c
> @@ -461,6 +461,8 @@ cifs_show_options(struct seq_file *s, struct dentry
> *root)
>                 seq_puts(s, ",nocase");
>         if (tcon->retry)
>                 seq_puts(s, ",hard");
> +       else
> +               seq_puts(s, ",soft");
>         if (tcon->use_persistent)
>                 seq_puts(s, ",persistenthandles");
>         else if (tcon->use_resilient)
> --
> 2.13.3
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Steve French Sept. 20, 2017, 3:25 a.m. | #2
What does NFS do - does it show both "soft" and "hard"?

On Tue, Sep 19, 2017 at 10:22 PM, Steve French <smfrench@gmail.com> wrote:
> Opinions on stable?
>
> On Sep 19, 2017 8:09 PM, "Ronnie Sahlberg" <lsahlber@redhat.com> wrote:
>>
>> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
>> ---
>>  fs/cifs/cifsfs.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
>> index 180b3356ff86..a864e6575309 100644
>> --- a/fs/cifs/cifsfs.c
>> +++ b/fs/cifs/cifsfs.c
>> @@ -461,6 +461,8 @@ cifs_show_options(struct seq_file *s, struct dentry
>> *root)
>>                 seq_puts(s, ",nocase");
>>         if (tcon->retry)
>>                 seq_puts(s, ",hard");
>> +       else
>> +               seq_puts(s, ",soft");
>>         if (tcon->use_persistent)
>>                 seq_puts(s, ",persistenthandles");
>>         else if (tcon->use_resilient)
>> --
>> 2.13.3
>>
>
Leif Sahlberg Sept. 20, 2017, 3:31 a.m. | #3
NFS does the same, well except for the fact that 'hard' is default in that land.

NFS:
Mount with 'hard'  : mount shows ',hard'
Mount with 'soft'  : mount shows ',soft'
Mount with default : mount shows ',hard'



----- Original Message -----
From: "Steve French" <smfrench@gmail.com>
To: "Ronnie Sahlberg" <lsahlber@redhat.com>
Cc: "linux-cifs" <linux-cifs@vger.kernel.org>
Sent: Wednesday, 20 September, 2017 1:25:52 PM
Subject: Re: [PATCH] cifs: show 'soft' in the mount options for !hard mounts

What does NFS do - does it show both "soft" and "hard"?

On Tue, Sep 19, 2017 at 10:22 PM, Steve French <smfrench@gmail.com> wrote:
> Opinions on stable?
>
> On Sep 19, 2017 8:09 PM, "Ronnie Sahlberg" <lsahlber@redhat.com> wrote:
>>
>> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
>> ---
>>  fs/cifs/cifsfs.c | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
>> index 180b3356ff86..a864e6575309 100644
>> --- a/fs/cifs/cifsfs.c
>> +++ b/fs/cifs/cifsfs.c
>> @@ -461,6 +461,8 @@ cifs_show_options(struct seq_file *s, struct dentry
>> *root)
>>                 seq_puts(s, ",nocase");
>>         if (tcon->retry)
>>                 seq_puts(s, ",hard");
>> +       else
>> +               seq_puts(s, ",soft");
>>         if (tcon->use_persistent)
>>                 seq_puts(s, ",persistenthandles");
>>         else if (tcon->use_resilient)
>> --
>> 2.13.3
>>
>

Patch

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 180b3356ff86..a864e6575309 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -461,6 +461,8 @@  cifs_show_options(struct seq_file *s, struct dentry *root)
 		seq_puts(s, ",nocase");
 	if (tcon->retry)
 		seq_puts(s, ",hard");
+	else
+		seq_puts(s, ",soft");
 	if (tcon->use_persistent)
 		seq_puts(s, ",persistenthandles");
 	else if (tcon->use_resilient)