Skip to content

Commit 9e2b9f3

Browse files
committed
SUNRPC: Remove the redundant XPRT_CONNECTION_CLOSE flag
Signed-off-by: Trond Myklebust <[email protected]>
1 parent caf4ccd commit 9e2b9f3

File tree

3 files changed

+0
-3
lines changed

3 files changed

+0
-3
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_CLOSE (8)
364363
#define XPRT_CONGESTED (9)
365364

366365
static inline void xprt_set_connected(struct rpc_xprt *xprt)

net/sunrpc/xprt.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,6 @@ xprt_init_autodisconnect(unsigned long data)
683683
if (test_and_set_bit(XPRT_LOCKED, &xprt->state))
684684
goto out_abort;
685685
spin_unlock(&xprt->transport_lock);
686-
set_bit(XPRT_CONNECTION_CLOSE, &xprt->state);
687686
queue_work(rpciod_workqueue, &xprt->task_cleanup);
688687
return;
689688
out_abort:

net/sunrpc/xprtsock.c

Lines changed: 0 additions & 1 deletion
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_CLOSE, &xprt->state);
808807
clear_bit(XPRT_CLOSE_WAIT, &xprt->state);
809808
clear_bit(XPRT_CLOSING, &xprt->state);
810809
smp_mb__after_atomic();

0 commit comments

Comments
 (0)