From: Roman Smirnov <r.smirnov@omp.ru>
Date: Mon, 31 Mar 2025 08:22:50 +0000 (+0300)
Subject: cifs: remove unreachable code in cifs_get_tcp_session()
X-Git-Tag: v6.15-rc1~16^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be5d361e3083a469385eff34b46ad58eb97b1e38;p=thirdparty%2Fkernel%2Fstable.git

cifs: remove unreachable code in cifs_get_tcp_session()

echo_interval is checked at mount time, the code has become
unreachable.

Signed-off-by: Roman Smirnov <r.smirnov@omp.ru>
Signed-off-by: Steve French <stfrench@microsoft.com>
---

diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c
index d7bad2c3af37b..0721e557f2e0c 100644
--- a/fs/smb/client/connect.c
+++ b/fs/smb/client/connect.c
@@ -1731,12 +1731,8 @@ cifs_get_tcp_session(struct smb3_fs_context *ctx,
 	 */
 	tcp_ses->tcpStatus = CifsNew;
 	++tcp_ses->srv_count;
+	tcp_ses->echo_interval = ctx->echo_interval * HZ;
 
-	if (ctx->echo_interval >= SMB_ECHO_INTERVAL_MIN &&
-		ctx->echo_interval <= SMB_ECHO_INTERVAL_MAX)
-		tcp_ses->echo_interval = ctx->echo_interval * HZ;
-	else
-		tcp_ses->echo_interval = SMB_ECHO_INTERVAL_DEFAULT * HZ;
 	if (tcp_ses->rdma) {
 #ifndef CONFIG_CIFS_SMB_DIRECT
 		cifs_dbg(VFS, "CONFIG_CIFS_SMB_DIRECT is not enabled\n");