diff options
-rw-r--r-- | net/sunrpc/xprtsock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index a76446a4d670..8ff57c59b445 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -1754,12 +1754,12 @@ out: | |||
1754 | * We need to preserve the port number so the reply cache on the server can | 1754 | * We need to preserve the port number so the reply cache on the server can |
1755 | * find our cached RPC replies when we get around to reconnecting. | 1755 | * find our cached RPC replies when we get around to reconnecting. |
1756 | */ | 1756 | */ |
1757 | static void xs_abort_connection(struct rpc_xprt *xprt, struct sock_xprt *transport) | 1757 | static void xs_abort_connection(struct sock_xprt *transport) |
1758 | { | 1758 | { |
1759 | int result; | 1759 | int result; |
1760 | struct sockaddr any; | 1760 | struct sockaddr any; |
1761 | 1761 | ||
1762 | dprintk("RPC: disconnecting xprt %p to reuse port\n", xprt); | 1762 | dprintk("RPC: disconnecting xprt %p to reuse port\n", transport); |
1763 | 1763 | ||
1764 | /* | 1764 | /* |
1765 | * Disconnect the transport socket by doing a connect operation | 1765 | * Disconnect the transport socket by doing a connect operation |
@@ -1769,13 +1769,13 @@ static void xs_abort_connection(struct rpc_xprt *xprt, struct sock_xprt *transpo | |||
1769 | any.sa_family = AF_UNSPEC; | 1769 | any.sa_family = AF_UNSPEC; |
1770 | result = kernel_connect(transport->sock, &any, sizeof(any), 0); | 1770 | result = kernel_connect(transport->sock, &any, sizeof(any), 0); |
1771 | if (!result) | 1771 | if (!result) |
1772 | xs_sock_mark_closed(xprt); | 1772 | xs_sock_mark_closed(&transport->xprt); |
1773 | else | 1773 | else |
1774 | dprintk("RPC: AF_UNSPEC connect return code %d\n", | 1774 | dprintk("RPC: AF_UNSPEC connect return code %d\n", |
1775 | result); | 1775 | result); |
1776 | } | 1776 | } |
1777 | 1777 | ||
1778 | static void xs_tcp_reuse_connection(struct rpc_xprt *xprt, struct sock_xprt *transport) | 1778 | static void xs_tcp_reuse_connection(struct sock_xprt *transport) |
1779 | { | 1779 | { |
1780 | unsigned int state = transport->inet->sk_state; | 1780 | unsigned int state = transport->inet->sk_state; |
1781 | 1781 | ||
@@ -1798,7 +1798,7 @@ static void xs_tcp_reuse_connection(struct rpc_xprt *xprt, struct sock_xprt *tra | |||
1798 | "sk_shutdown set to %d\n", | 1798 | "sk_shutdown set to %d\n", |
1799 | __func__, transport->inet->sk_shutdown); | 1799 | __func__, transport->inet->sk_shutdown); |
1800 | } | 1800 | } |
1801 | xs_abort_connection(xprt, transport); | 1801 | xs_abort_connection(transport); |
1802 | } | 1802 | } |
1803 | 1803 | ||
1804 | static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) | 1804 | static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) |
@@ -1875,7 +1875,7 @@ static void xs_tcp_setup_socket(struct sock_xprt *transport, | |||
1875 | abort_and_exit = test_and_clear_bit(XPRT_CONNECTION_ABORT, | 1875 | abort_and_exit = test_and_clear_bit(XPRT_CONNECTION_ABORT, |
1876 | &xprt->state); | 1876 | &xprt->state); |
1877 | /* "close" the socket, preserving the local port */ | 1877 | /* "close" the socket, preserving the local port */ |
1878 | xs_tcp_reuse_connection(xprt, transport); | 1878 | xs_tcp_reuse_connection(transport); |
1879 | 1879 | ||
1880 | if (abort_and_exit) | 1880 | if (abort_and_exit) |
1881 | goto out_eagain; | 1881 | goto out_eagain; |