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

Commit 8d65ef76 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

sunrpc: eliminate the XPT_DETACHED flag 



All it does is indicate whether a xprt has already been deleted from
a list or not, which is unnecessary since we use list_del_init and it's
always set and checked under the sv_lock anyway.

Signed-off-by: default avatarJeff Layton <jlayton@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 56429e9b

include/linux/sunrpc/svc_xprt.h

+3 −4
Original line number Diff line number Diff line
@@ -63,10 +63,9 @@ struct svc_xprt { 
#define	XPT_CHNGBUF	7		/* need to change snd/rcv buf sizes */

#define	XPT_DEFERRED	8		/* deferred request pending */

#define	XPT_OLD		9		/* used for xprt aging mark+sweep */

#define	XPT_DETACHED	10		/* detached from tempsocks list */

#define XPT_LISTENER	11		/* listening endpoint */

#define XPT_CACHE_AUTH	12		/* cache auth info */

#define XPT_LOCAL	13		/* connection from loopback interface */

#define XPT_LISTENER	10		/* listening endpoint */

#define XPT_CACHE_AUTH	11		/* cache auth info */

#define XPT_LOCAL	12		/* connection from loopback interface */



	struct svc_serv		*xpt_server;	/* service for transport */

	atomic_t    	    	xpt_reserved;	/* space on outq that is rsvd */

net/sunrpc/svc_xprt.c

+1 −3
Original line number Diff line number Diff line
@@ -884,7 +884,6 @@ static void svc_age_temp_xprts(unsigned long closure) 
			continue;

		list_del_init(le);

		set_bit(XPT_CLOSE, &xprt->xpt_flags);

		set_bit(XPT_DETACHED, &xprt->xpt_flags);

		dprintk("queuing xprt %p for closing\n", xprt);



		/* a thread will dequeue and close it soon */
@@ -924,7 +923,6 @@ static void svc_delete_xprt(struct svc_xprt *xprt) 
	xprt->xpt_ops->xpo_detach(xprt);



	spin_lock_bh(&serv->sv_lock);

	if (!test_and_set_bit(XPT_DETACHED, &xprt->xpt_flags))

	list_del_init(&xprt->xpt_list);

	WARN_ON_ONCE(!list_empty(&xprt->xpt_ready));

	if (test_bit(XPT_TEMP, &xprt->xpt_flags))