Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1806c7b authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Move reset of TCP state variables into the reconnect code 



Rather than resetting state variables in socket state_change() callback,
do it in the sunrpc TCP connect function itself.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent d1109aa5

net/sunrpc/xprtsock.c

+6 −7
Original line number Diff line number Diff line
@@ -1600,13 +1600,6 @@ static void xs_tcp_state_change(struct sock *sk) 
	case TCP_ESTABLISHED:

		spin_lock(&xprt->transport_lock);

		if (!xprt_test_and_set_connected(xprt)) {



			/* Reset TCP record info */

			transport->recv.offset = 0;

			transport->recv.len = 0;

			transport->recv.copied = 0;

			transport->recv.flags =

				TCP_RCV_COPY_FRAGHDR | TCP_RCV_COPY_XID;

			xprt->connect_cookie++;

			clear_bit(XPRT_SOCK_CONNECTING, &transport->sock_state);

			xprt_clear_connecting(xprt);
@@ -2386,6 +2379,12 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) 


	xs_set_memalloc(xprt);



	/* Reset TCP record info */

	transport->recv.offset = 0;

	transport->recv.len = 0;

	transport->recv.copied = 0;

	transport->recv.flags = TCP_RCV_COPY_FRAGHDR | TCP_RCV_COPY_XID;



	/* Tell the socket layer to start connecting... */

	xprt->stat.connect_count++;

	xprt->stat.connect_start = jiffies;