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

Commit 9e2b9f37 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Remove the redundant XPRT_CONNECTION_CLOSE flag 



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

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_CLOSE	(8)

#define XPRT_CONGESTED		(9)



static inline void xprt_set_connected(struct rpc_xprt *xprt)

net/sunrpc/xprt.c

+0 −1
Original line number Diff line number Diff line
@@ -683,7 +683,6 @@ xprt_init_autodisconnect(unsigned long data) 
	if (test_and_set_bit(XPRT_LOCKED, &xprt->state))

		goto out_abort;

	spin_unlock(&xprt->transport_lock);

	set_bit(XPRT_CONNECTION_CLOSE, &xprt->state);

	queue_work(rpciod_workqueue, &xprt->task_cleanup);

	return;

out_abort:

net/sunrpc/xprtsock.c

+0 −1
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_CLOSE, &xprt->state);

	clear_bit(XPRT_CLOSE_WAIT, &xprt->state);

	clear_bit(XPRT_CLOSING, &xprt->state);

	smp_mb__after_atomic();