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

sunrpc: Get xprt pointer once in xs_tcp_setup_socket

Browse source 
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:25 +04:00 committed by J. Bruce Fields
parent baaf4e487a
commit a9f5f0f7bf
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/sunrpc/xprtsock.c
View file

@ -1851,12 +1851,12 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
* *
* Invoked by a work queue tasklet. * Invoked by a work queue tasklet.
*/ */
static void xs_tcp_setup_socket(struct rpc_xprt *xprt, static void xs_tcp_setup_socket(struct sock_xprt *transport,
struct sock_xprt *transport,
struct socket *(*create_sock)(struct rpc_xprt *, struct socket *(*create_sock)(struct rpc_xprt *,
struct sock_xprt *)) struct sock_xprt *))
{ {
struct socket *sock = transport->sock; struct socket *sock = transport->sock;
struct rpc_xprt *xprt = &transport->xprt;
int status = -EIO; int status = -EIO;
if (xprt->shutdown) if (xprt->shutdown)
@ -1958,9 +1958,8 @@ static void xs_tcp_connect_worker4(struct work_struct *work)
{ {
struct sock_xprt *transport = struct sock_xprt *transport =
container_of(work, struct sock_xprt, connect_worker.work); container_of(work, struct sock_xprt, connect_worker.work);
struct rpc_xprt *xprt = &transport->xprt;
xs_tcp_setup_socket(xprt, transport, xs_create_tcp_sock4); xs_tcp_setup_socket(transport, xs_create_tcp_sock4);
} }
static struct socket *xs_create_tcp_sock6(struct rpc_xprt *xprt, static struct socket *xs_create_tcp_sock6(struct rpc_xprt *xprt,
@ -1997,9 +1996,8 @@ static void xs_tcp_connect_worker6(struct work_struct *work)
{ {
struct sock_xprt *transport = struct sock_xprt *transport =
container_of(work, struct sock_xprt, connect_worker.work); container_of(work, struct sock_xprt, connect_worker.work);
struct rpc_xprt *xprt = &transport->xprt;
xs_tcp_setup_socket(xprt, transport, xs_create_tcp_sock6); xs_tcp_setup_socket(transport, xs_create_tcp_sock6);
} }
/** /**