aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtsock.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-11-06 18:44:20 -0500
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-01-30 02:05:27 -0500
commit62da3b24880bccd4ffc32cf8d9a7e23fab475bdd (patch)
tree334804c6eb817bd7827f58dbe86ced455160052d /net/sunrpc/xprtsock.c
parent3ebb067d92ebe5bcfd282acf12bade891d334d07 (diff)
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:
777 clear_bit(XPRT_CLOSE_WAIT, &xprt->state); 777 clear_bit(XPRT_CLOSE_WAIT, &xprt->state);
778 clear_bit(XPRT_CLOSING, &xprt->state); 778 clear_bit(XPRT_CLOSING, &xprt->state);
779 smp_mb__after_clear_bit(); 779 smp_mb__after_clear_bit();
780 xprt_disconnect(xprt); 780 xprt_disconnect_done(xprt);
781} 781}
782 782
783/** 783/**
@@ -1159,7 +1159,7 @@ static void xs_tcp_state_change(struct sock *sk)
1159 clear_bit(XPRT_CLOSING, &xprt->state); 1159 clear_bit(XPRT_CLOSING, &xprt->state);
1160 smp_mb__after_clear_bit(); 1160 smp_mb__after_clear_bit();
1161 /* Mark transport as closed and wake up all pending tasks */ 1161 /* Mark transport as closed and wake up all pending tasks */
1162 xprt_disconnect(xprt); 1162 xprt_disconnect_done(xprt);
1163 } 1163 }
1164 out: 1164 out:
1165 read_unlock(&sk->sk_callback_lock); 1165 read_unlock(&sk->sk_callback_lock);