summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtsock.c
diff options
context:
space:
mode:
authorTrond Myklebust2007-11-07 00:44:20 +0100
committerTrond Myklebust2008-01-30 08:05:27 +0100
commit62da3b24880bccd4ffc32cf8d9a7e23fab475bdd (patch)
tree334804c6eb817bd7827f58dbe86ced455160052d /net/sunrpc/xprtsock.c
parentSUNRPC: Make call_status()/call_decode() call xprt_force_disconnect() (diff)
downloadkernel-qcow2-linux-62da3b24880bccd4ffc32cf8d9a7e23fab475bdd.tar.gz
kernel-qcow2-linux-62da3b24880bccd4ffc32cf8d9a7e23fab475bdd.tar.xz
kernel-qcow2-linux-62da3b24880bccd4ffc32cf8d9a7e23fab475bdd.zip
SUNRPC: Rename xprt_disconnect()
xprt_disconnect() should really only be called when the transport shutdown is completed, and it is time to wake up any pending tasks. Rename it to xprt_disconnect_done() in order to reflect the semantical change. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r--net/sunrpc/xprtsock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 8c9af3d92c67..741ab8ad1f3a 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -777,7 +777,7 @@ clear_close_wait:
clear_bit(XPRT_CLOSE_WAIT, &xprt->state);
clear_bit(XPRT_CLOSING, &xprt->state);
smp_mb__after_clear_bit();
- xprt_disconnect(xprt);
+ xprt_disconnect_done(xprt);
}
/**
@@ -1159,7 +1159,7 @@ static void xs_tcp_state_change(struct sock *sk)
clear_bit(XPRT_CLOSING, &xprt->state);
smp_mb__after_clear_bit();
/* Mark transport as closed and wake up all pending tasks */
- xprt_disconnect(xprt);
+ xprt_disconnect_done(xprt);
}
out:
read_unlock(&sk->sk_callback_lock);