]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
SUNRPC: Remove dead code from xs_tcp_tls_setup_socket()
authorChuck Lever <chuck.lever@oracle.com>
Wed, 21 May 2025 20:34:14 +0000 (16:34 -0400)
committerAnna Schumaker <anna.schumaker@oracle.com>
Wed, 28 May 2025 21:17:14 +0000 (17:17 -0400)
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 <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
net/sunrpc/xprtsock.c

index 4b10ecf4c26538d5566be3cdb2a9388dae3b5ff4..04ff66758fc3e8bad5f1b0fadcaf8bfe7082ef05 100644 (file)
@@ -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