Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b869cb7a authored by Steve French's avatar Steve French Committed by Greg Kroah-Hartman
Browse files

cifs: fix missing display of three mount options 



commit 2bfd81043e944af0e52835ef6d9b41795af22341 upstream.

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: default avatarPaulo Alcantara (SUSE) <pc@cjr.nz>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 149babe5

fs/cifs/cifsfs.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -609,9 +609,15 @@ cifs_show_options(struct seq_file *s, struct dentry *root) 
	seq_printf(s, ",echo_interval=%lu",

	seq_printf(s, ",echo_interval=%lu",

			tcon->ses->server->echo_interval / HZ);

			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)

	if (tcon->ses->server->max_credits != SMB2_MAX_CREDITS_AVAILABLE)

		seq_printf(s, ",max_credits=%u", tcon->ses->server->max_credits);

		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)

	if (tcon->snapshot_time)

		seq_printf(s, ",snapshot=%llu", tcon->snapshot_time);

		seq_printf(s, ",snapshot=%llu", tcon->snapshot_time);