diff options
| author |   Chuck Lever <chuck.lever@oracle.com> | 2025-05-21 16:34:14 -0400 |
|---|---|---|
| committer |   Anna Schumaker <anna.schumaker@oracle.com> | 2025-05-28 17:17:14 -0400 |
| commit | 111f9e4b0dcdd493094dad98ecbed490887710c0 (patch) | |
| tree | 35dd35d40b6b4d04dfb4ce16c1eed7ffb3cfa44f /net | |
| parent | SUNRPC: Prevent hang on NFS mount with xprtsec=[m]tls (diff) | |
| download | linux-rng-111f9e4b0dcdd493094dad98ecbed490887710c0.tar.xz linux-rng-111f9e4b0dcdd493094dad98ecbed490887710c0.zip | |
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 <chuck.lever@oracle.com>
Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 4b10ecf4c265..04ff66758fc3 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 |