From 877197c29970b91f162163aa58e75dab0bae0970 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 6 Nov 2007 18:28:53 -0500 Subject: [PATCH] --- yaml --- r: 79578 b: refs/heads/master c: 7272dcd31d56580dee7693c21e369fd167e137fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/sunrpc/xprt.c | 1 - trunk/net/sunrpc/xprtsock.c | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0428f49dfe16..a736e5b53b6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e06799f958bf7f9f8fae15f0c6f519953fb0257c +refs/heads/master: 7272dcd31d56580dee7693c21e369fd167e137fe diff --git a/trunk/net/sunrpc/xprt.c b/trunk/net/sunrpc/xprt.c index a3af02168af1..80742995e02e 100644 --- a/trunk/net/sunrpc/xprt.c +++ b/trunk/net/sunrpc/xprt.c @@ -568,7 +568,6 @@ static void xprt_autoclose(struct work_struct *work) struct rpc_xprt *xprt = container_of(work, struct rpc_xprt, task_cleanup); - xprt_disconnect(xprt); xprt->ops->close(xprt); clear_bit(XPRT_CLOSE_WAIT, &xprt->state); xprt_release_write(xprt, NULL); diff --git a/trunk/net/sunrpc/xprtsock.c b/trunk/net/sunrpc/xprtsock.c index a4c06900f398..9b06b8b2a112 100644 --- a/trunk/net/sunrpc/xprtsock.c +++ b/trunk/net/sunrpc/xprtsock.c @@ -774,10 +774,10 @@ static void xs_close(struct rpc_xprt *xprt) sock_release(sock); clear_close_wait: smp_mb__before_clear_bit(); - clear_bit(XPRT_CONNECTED, &xprt->state); clear_bit(XPRT_CLOSE_WAIT, &xprt->state); clear_bit(XPRT_CLOSING, &xprt->state); smp_mb__after_clear_bit(); + xprt_disconnect(xprt); } /** @@ -793,7 +793,6 @@ static void xs_destroy(struct rpc_xprt *xprt) cancel_rearming_delayed_work(&transport->connect_worker); - xprt_disconnect(xprt); xs_close(xprt); xs_free_peer_addresses(xprt); kfree(xprt->slot);