cifs: fix missing display of three mount options

Three mount options: "tcpnodelay" and "noautotune" and "noblocksend"
were not displayed when passed in on cifs/smb3 mounts (e.g. displayed
in /proc/mounts e.g.).  No change to defaults so these are not
displayed if not specified on mount.

Cc: stable@vger.kernel.org
Reviewed-by: Paulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 712a431614480d082cd6cb24683a6bc378e27df7..6094cb2ff099bf567a72cdc1f173d58d3a7eecb2 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -678,9 +678,15 @@ cifs_show_options(struct seq_file *s, struct dentry *root)
        seq_printf(s, ",echo_interval=%lu",
                        tcon->ses->server->echo_interval / HZ);
 
-       /* Only display max_credits if it was overridden on mount */
+       /* Only display the following if overridden on mount */
        if (tcon->ses->server->max_credits != SMB2_MAX_CREDITS_AVAILABLE)
                seq_printf(s, ",max_credits=%u", tcon->ses->server->max_credits);
+       if (tcon->ses->server->tcp_nodelay)
+               seq_puts(s, ",tcpnodelay");
+       if (tcon->ses->server->noautotune)
+               seq_puts(s, ",noautotune");
+       if (tcon->ses->server->noblocksnd)
+               seq_puts(s, ",noblocksend");
 
        if (tcon->snapshot_time)
                seq_printf(s, ",snapshot=%llu", tcon->snapshot_time);