From: Trond Myklebust Date: Mon, 1 Dec 2008 12:56:06 -0500 SUNRPC: We only need to call svc_delete_xprt() once... Use XPT_DEAD to ensure that we only call xpo_detach & friends once. Signed-off-by: Trond Myklebust --- net/sunrpc/svc_xprt.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index bf5b5cd..a417064 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c @@ -838,6 +838,10 @@ void svc_delete_xprt(struct svc_xprt *xprt) { struct svc_serv *serv = xprt->xpt_server; + /* Only do this once */ + if (test_and_set_bit(XPT_DEAD, &xprt->xpt_flags) != 0) + return; + dprintk("svc: svc_delete_xprt(%p)\n", xprt); xprt->xpt_ops->xpo_detach(xprt); @@ -851,13 +855,14 @@ void svc_delete_xprt(struct svc_xprt *xprt) * while still attached to a queue, the queue itself * is about to be destroyed (in svc_destroy). */ - if (!test_and_set_bit(XPT_DEAD, &xprt->xpt_flags)) { - BUG_ON(atomic_read(&xprt->xpt_ref.refcount) < 2); - if (test_bit(XPT_TEMP, &xprt->xpt_flags)) - serv->sv_tmpcnt--; - svc_xprt_put(xprt); - } + if (test_bit(XPT_TEMP, &xprt->xpt_flags)) + serv->sv_tmpcnt--; spin_unlock_bh(&serv->sv_lock); + + /* FIXME: Is this really needed here? */ + BUG_ON(atomic_read(&xprt->xpt_ref.refcount) < 2); + + svc_xprt_put(xprt); } void svc_close_xprt(struct svc_xprt *xprt)