Commit 5b2abdaf authored by Shyam Prasad N's avatar Shyam Prasad N Committed by Steve French
Browse files

cifs: use echo_interval even when connection not ready. 



When the tcp connection is not ready to send requests,
we keep retrying echo with an interval of zero.

This seems unnecessary, and this fix changes the interval
between echoes to what is specified as echo_interval.

Signed-off-by: default avatarShyam Prasad N <sprasad@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent f4916649

fs/cifs/connect.c

+1 −11
Original line number Diff line number Diff line
@@ -392,16 +392,6 @@ cifs_echo_request(struct work_struct *work) 
	int rc;

	struct TCP_Server_Info *server = container_of(work,

					struct TCP_Server_Info, echo.work);

	unsigned long echo_interval;



	/*

	 * If we need to renegotiate, set echo interval to zero to

	 * immediately call echo service where we can renegotiate.

	 */

	if (server->tcpStatus == CifsNeedNegotiate)

		echo_interval = 0;

	else

		echo_interval = server->echo_interval;



	/*

	 * We cannot send an echo if it is disabled.
@@ -412,7 +402,7 @@ cifs_echo_request(struct work_struct *work) 
	    server->tcpStatus == CifsExiting ||

	    server->tcpStatus == CifsNew ||

	    (server->ops->can_echo && !server->ops->can_echo(server)) ||

	    time_before(jiffies, server->lstrp + echo_interval - HZ))

	    time_before(jiffies, server->lstrp + server->echo_interval - HZ))

		goto requeue_echo;



	rc = server->ops->echo ? server->ops->echo(server) : -ENOSYS;