diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2010-10-04 16:52:25 +0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-10-19 10:48:14 -0400 |
| commit | a9f5f0f7bf72f3f1451e844681fb3cb5d0b1c80d (patch) | |
| tree | 74ecbabea35a7f7b7995a49a25ada7fb8345116c /net/sunrpc | |
| parent | baaf4e487a9c42b345bde14698fd566f864c9287 (diff) | |
| download | linux-a9f5f0f7bf72f3f1451e844681fb3cb5d0b1c80d.tar.gz linux-a9f5f0f7bf72f3f1451e844681fb3cb5d0b1c80d.tar.bz2 linux-a9f5f0f7bf72f3f1451e844681fb3cb5d0b1c80d.zip | |
sunrpc: Get xprt pointer once in xs_tcp_setup_socket
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>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 024a64443203..a76446a4d670 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1851,12 +1851,12 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) * * Invoked by a work queue tasklet. */ -static void xs_tcp_setup_socket(struct rpc_xprt *xprt, - struct sock_xprt *transport, +static void xs_tcp_setup_socket(struct sock_xprt *transport, struct socket *(*create_sock)(struct rpc_xprt *, struct sock_xprt *)) { struct socket *sock = transport->sock; + struct rpc_xprt *xprt = &transport->xprt; int status = -EIO; if (xprt->shutdown) @@ -1958,9 +1958,8 @@ static void xs_tcp_connect_worker4(struct work_struct *work) { struct sock_xprt *transport = 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, @@ -1997,9 +1996,8 @@ static void xs_tcp_connect_worker6(struct work_struct *work) { struct sock_xprt *transport = 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); } /** |