aboutsummaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtsock.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2010-10-04 08:52:25 -0400
committerJ. Bruce Fields <bfields@redhat.com>2010-10-19 10:48:14 -0400
commita9f5f0f7bf72f3f1451e844681fb3cb5d0b1c80d (patch)
tree74ecbabea35a7f7b7995a49a25ada7fb8345116c /net/sunrpc/xprtsock.c
parentbaaf4e487a9c42b345bde14698fd566f864c9287 (diff)
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/xprtsock.c')
-rw-r--r--net/sunrpc/xprtsock.c10
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)
1851 * 1851 *
1852 * Invoked by a work queue tasklet. 1852 * Invoked by a work queue tasklet.
1853 */ 1853 */
1854static void xs_tcp_setup_socket(struct rpc_xprt *xprt, 1854static void xs_tcp_setup_socket(struct sock_xprt *transport,
1855 struct sock_xprt *transport,
1856 struct socket *(*create_sock)(struct rpc_xprt *, 1855 struct socket *(*create_sock)(struct rpc_xprt *,
1857 struct sock_xprt *)) 1856 struct sock_xprt *))
1858{ 1857{
1859 struct socket *sock = transport->sock; 1858 struct socket *sock = transport->sock;
1859 struct rpc_xprt *xprt = &transport->xprt;
1860 int status = -EIO; 1860 int status = -EIO;
1861 1861
1862 if (xprt->shutdown) 1862 if (xprt->shutdown)
@@ -1958,9 +1958,8 @@ static void xs_tcp_connect_worker4(struct work_struct *work)
1958{ 1958{
1959 struct sock_xprt *transport = 1959 struct sock_xprt *transport =
1960 container_of(work, struct sock_xprt, connect_worker.work); 1960 container_of(work, struct sock_xprt, connect_worker.work);
1961 struct rpc_xprt *xprt = &transport->xprt;
1962 1961
1963 xs_tcp_setup_socket(xprt, transport, xs_create_tcp_sock4); 1962 xs_tcp_setup_socket(transport, xs_create_tcp_sock4);
1964} 1963}
1965 1964
1966static struct socket *xs_create_tcp_sock6(struct rpc_xprt *xprt, 1965static struct socket *xs_create_tcp_sock6(struct rpc_xprt *xprt,
@@ -1997,9 +1996,8 @@ static void xs_tcp_connect_worker6(struct work_struct *work)
1997{ 1996{
1998 struct sock_xprt *transport = 1997 struct sock_xprt *transport =
1999 container_of(work, struct sock_xprt, connect_worker.work); 1998 container_of(work, struct sock_xprt, connect_worker.work);
2000 struct rpc_xprt *xprt = &transport->xprt;
2001 1999
2002 xs_tcp_setup_socket(xprt, transport, xs_create_tcp_sock6); 2000 xs_tcp_setup_socket(transport, xs_create_tcp_sock6);
2003} 2001}
2004 2002
2005/** 2003/**