cifs: clean up checks in cifs_echo_request (195291e6) · Commits · 戴 / test

Follow-on patch to which is already in Steve's tree... The check for tcpStatus == CifsGood is not meaningful since it doesn't indicate whether the NEGOTIATE request has been done. Also, clarify why we're checking for maxBuf == 0. Signed-off-by:

Jeff Layton <jlayton@redhat.com> Signed-off-by:

Steve French <sfrench@us.ibm.com>

fs/cifs/connect.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -338,10 +338,11 @@ cifs_echo_request(struct work_struct *work)
		struct TCP_Server_Info, echo.work);

		/*
		* We cannot send an echo until the NEGOTIATE_PROTOCOL request is done.
		* Also, no need to ping if we got a response recently
		* We cannot send an echo until the NEGOTIATE_PROTOCOL request is
		* done, which is indicated by maxBuf != 0. Also, no need to ping if
		* we got a response recently
		*/
		if ((server->tcpStatus != CifsGood) \|\| (server->maxBuf == 0) \|\|
		if (server->maxBuf == 0 \|\|
		time_before(jiffies, server->lstrp + SMB_ECHO_INTERVAL - HZ))
		goto requeue_echo;

Admin message