Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sunrpc: Remove duplicate xprt/transport arguments from calls

Browse source 
The xs_tcp_reuse_connection takes the xprt only to pass it down
to the xs_abort_connection. The later one can get it from the given
transport itself.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Pavel Emelyanov 2010-10-04 16:52:55 +04:00 committed by J. Bruce Fields
parent a9f5f0f7bf
commit 58dddac9c5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
net/sunrpc/xprtsock.c
View file

@ -1754,12 +1754,12 @@ static void xs_udp_connect_worker6(struct work_struct *work)
* We need to preserve the port number so the reply cache on the server can * We need to preserve the port number so the reply cache on the server can
* find our cached RPC replies when we get around to reconnecting. * find our cached RPC replies when we get around to reconnecting.
*/ */
static void xs_abort_connection(struct rpc_xprt *xprt, struct sock_xprt *transport) static void xs_abort_connection(struct sock_xprt *transport)
{ {
int result; int result;
struct sockaddr any; struct sockaddr any;
dprintk("RPC: disconnecting xprt %p to reuse port\n", xprt); dprintk("RPC: disconnecting xprt %p to reuse port\n", transport);
/* /*
* Disconnect the transport socket by doing a connect operation * 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
any.sa_family = AF_UNSPEC; any.sa_family = AF_UNSPEC;
result = kernel_connect(transport->sock, &any, sizeof(any), 0); result = kernel_connect(transport->sock, &any, sizeof(any), 0);
if (!result) if (!result)
xs_sock_mark_closed(xprt); xs_sock_mark_closed(&transport->xprt);
else else
dprintk("RPC: AF_UNSPEC connect return code %d\n", dprintk("RPC: AF_UNSPEC connect return code %d\n",
result); result);
} }
static void xs_tcp_reuse_connection(struct rpc_xprt *xprt, struct sock_xprt *transport) static void xs_tcp_reuse_connection(struct sock_xprt *transport)
{ {
unsigned int state = transport->inet->sk_state; unsigned int state = transport->inet->sk_state;
@ -1798,7 +1798,7 @@ static void xs_tcp_reuse_connection(struct rpc_xprt *xprt, struct sock_xprt *tra
"sk_shutdown set to %d\n", "sk_shutdown set to %d\n",
__func__, transport->inet->sk_shutdown); __func__, transport->inet->sk_shutdown);
} }
xs_abort_connection(xprt, transport); xs_abort_connection(transport);
} }
static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) 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,
abort_and_exit = test_and_clear_bit(XPRT_CONNECTION_ABORT, abort_and_exit = test_and_clear_bit(XPRT_CONNECTION_ABORT,
&xprt->state); &xprt->state);
/* "close" the socket, preserving the local port */ /* "close" the socket, preserving the local port */
xs_tcp_reuse_connection(xprt, transport); xs_tcp_reuse_connection(transport);
if (abort_and_exit) if (abort_and_exit)
goto out_eagain; goto out_eagain;