Skip to content

Commit 111f9e4

Browse files
chuckleverAnna Schumaker
authored andcommitted
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 <[email protected]> Signed-off-by: Anna Schumaker <[email protected]>
1 parent 0bd2f6b commit 111f9e4

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

net/sunrpc/xprtsock.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2726,18 +2726,7 @@ static void xs_tcp_tls_setup_socket(struct work_struct *work)
27262726
if (status)
27272727
goto out_close;
27282728
xprt_release_write(lower_xprt, NULL);
2729-
27302729
trace_rpc_socket_connect(upper_xprt, upper_transport->sock, 0);
2731-
if (!xprt_test_and_set_connected(upper_xprt)) {
2732-
upper_xprt->connect_cookie++;
2733-
clear_bit(XPRT_SOCK_CONNECTING, &upper_transport->sock_state);
2734-
xprt_clear_connecting(upper_xprt);
2735-
2736-
upper_xprt->stat.connect_count++;
2737-
upper_xprt->stat.connect_time += (long)jiffies -
2738-
upper_xprt->stat.connect_start;
2739-
xs_run_error_worker(upper_transport, XPRT_SOCK_WAKE_PENDING);
2740-
}
27412730
rpc_shutdown_client(lower_clnt);
27422731

27432732
/* Check for ingress data that arrived before the socket's

0 commit comments

Comments
 (0)