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

Commit 505936f5 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Cleanup to remove remaining uses of XPRT_CONNECTION_ABORT 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 9cbc94fb

include/linux/sunrpc/xprt.h

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ void xprt_unlock_connect(struct rpc_xprt *, void *); 
#define XPRT_BOUND		(4)

#define XPRT_BINDING		(5)

#define XPRT_CLOSING		(6)

#define XPRT_CONNECTION_ABORT	(7)

#define XPRT_CONNECTION_CLOSE	(8)

#define XPRT_CONGESTED		(9)

net/sunrpc/xprtsock.c

+0 −3
Original line number Diff line number Diff line
@@ -804,7 +804,6 @@ static void xs_error_report(struct sock *sk) 
static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt)

{

	smp_mb__before_atomic();

	clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);

	clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state);

	clear_bit(XPRT_CLOSE_WAIT, &xprt->state);

	clear_bit(XPRT_CLOSING, &xprt->state);
@@ -1904,7 +1903,6 @@ static int xs_local_setup_socket(struct sock_xprt *transport) 
	struct socket *sock;

	int status = -EIO;



	clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);

	status = __sock_create(xprt->xprt_net, AF_LOCAL,

					SOCK_STREAM, 0, &sock, 1);

	if (status < 0) {
@@ -2149,7 +2147,6 @@ static void xs_tcp_setup_socket(struct work_struct *work) 
	int status = -EIO;



	if (!sock) {

		clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);

		sock = xs_create_sock(xprt, transport,

				xs_addr(xprt)->sa_family, SOCK_STREAM,

				IPPROTO_TCP, true);