Skip to content

Commit 505936f

Browse files
committed
SUNRPC: Cleanup to remove remaining uses of XPRT_CONNECTION_ABORT
Signed-off-by: Trond Myklebust <[email protected]>
1 parent 9cbc94f commit 505936f

File tree

2 files changed

+0
-4
lines changed

2 files changed

+0
-4
lines changed

include/linux/sunrpc/xprt.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ void xprt_unlock_connect(struct rpc_xprt *, void *);
360360
#define XPRT_BOUND (4)
361361
#define XPRT_BINDING (5)
362362
#define XPRT_CLOSING (6)
363-
#define XPRT_CONNECTION_ABORT (7)
364363
#define XPRT_CONNECTION_CLOSE (8)
365364
#define XPRT_CONGESTED (9)
366365

net/sunrpc/xprtsock.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,6 @@ static void xs_error_report(struct sock *sk)
804804
static void xs_sock_reset_connection_flags(struct rpc_xprt *xprt)
805805
{
806806
smp_mb__before_atomic();
807-
clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
808807
clear_bit(XPRT_CONNECTION_CLOSE, &xprt->state);
809808
clear_bit(XPRT_CLOSE_WAIT, &xprt->state);
810809
clear_bit(XPRT_CLOSING, &xprt->state);
@@ -1904,7 +1903,6 @@ static int xs_local_setup_socket(struct sock_xprt *transport)
19041903
struct socket *sock;
19051904
int status = -EIO;
19061905

1907-
clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
19081906
status = __sock_create(xprt->xprt_net, AF_LOCAL,
19091907
SOCK_STREAM, 0, &sock, 1);
19101908
if (status < 0) {
@@ -2149,7 +2147,6 @@ static void xs_tcp_setup_socket(struct work_struct *work)
21492147
int status = -EIO;
21502148

21512149
if (!sock) {
2152-
clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
21532150
sock = xs_create_sock(xprt, transport,
21542151
xs_addr(xprt)->sa_family, SOCK_STREAM,
21552152
IPPROTO_TCP, true);

0 commit comments

Comments
 (0)