From: Chuck Lever Date: Wed, 21 May 2025 20:34:14 +0000 (-0400) Subject: SUNRPC: Remove dead code from xs_tcp_tls_setup_socket() X-Git-Tag: v6.16-rc1~54^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=111f9e4b0dcdd493094dad98ecbed490887710c0;p=thirdparty%2Fkernel%2Flinux.git SUNRPC: Remove dead code from xs_tcp_tls_setup_socket() xs_tcp_tls_finish_connecting() already marks the upper xprt connected, so the same code in xs_tcp_tls_setup_socket() is never executed. Signed-off-by: Chuck Lever Signed-off-by: Anna Schumaker --- diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 4b10ecf4c2653..04ff66758fc3e 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -2726,18 +2726,7 @@ static void xs_tcp_tls_setup_socket(struct work_struct *work) if (status) goto out_close; xprt_release_write(lower_xprt, NULL); - trace_rpc_socket_connect(upper_xprt, upper_transport->sock, 0); - if (!xprt_test_and_set_connected(upper_xprt)) { - upper_xprt->connect_cookie++; - clear_bit(XPRT_SOCK_CONNECTING, &upper_transport->sock_state); - xprt_clear_connecting(upper_xprt); - - upper_xprt->stat.connect_count++; - upper_xprt->stat.connect_time += (long)jiffies - - upper_xprt->stat.connect_start; - xs_run_error_worker(upper_transport, XPRT_SOCK_WAKE_PENDING); - } rpc_shutdown_client(lower_clnt); /* Check for ingress data that arrived before the socket's