Commit 111f9e4b authored by Chuck Lever's avatar Chuck Lever Committed by Anna Schumaker
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
parent 0bd2f6b8

net/sunrpc/xprtsock.c

+0 −11
Original line number Diff line number Diff line
@@ -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