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

Commit ab1b18f7 authored by Neil Brown's avatar Neil Brown Committed by J. Bruce Fields
Browse files

sunrpc: remove unnecessary svc_xprt_put 



The 'struct svc_deferred_req's on the xpt_deferred queue do not
own a reference to the owning xprt.  This is seen in svc_revisit
which is where things are added to this queue.  dr->xprt is set to
NULL and the reference to the xprt it put.

So when this list is cleaned up in svc_delete_xprt, we mustn't
put the reference.

Also, replace the 'for' with a 'while' which is arguably
simpler and more likely to compile efficiently.

Cc: Tom Tucker <tom@opengridcomputing.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Cc: stable@kernel.org
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 58255a4e

net/sunrpc/svc_xprt.c

+1 −4
Original line number Diff line number Diff line
@@ -896,11 +896,8 @@ void svc_delete_xprt(struct svc_xprt *xprt) 
	if (test_bit(XPT_TEMP, &xprt->xpt_flags))

		serv->sv_tmpcnt--;



	for (dr = svc_deferred_dequeue(xprt); dr;

	     dr = svc_deferred_dequeue(xprt)) {

		svc_xprt_put(xprt);

	while ((dr = svc_deferred_dequeue(xprt)) != NULL)

		kfree(dr);

	}



	svc_xprt_put(xprt);

	spin_unlock_bh(&serv->sv_lock);