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

sunrpc: Pass family to setup_socket calls

Browse source 
Now we have a single socket creation routine and can call it
directly from the setup_socket routines.

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:57:11 +04:00 committed by J. Bruce Fields
parent 6bc9638ab4
commit 7dfe1fc362
1 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
net/sunrpc/xprtsock.c
View file

@ -1638,18 +1638,6 @@ static struct socket *xs_create_sock(struct rpc_xprt *xprt,
return ERR_PTR(err);
}
static struct socket *xs_create_sock4(struct rpc_xprt *xprt,
struct sock_xprt *transport, int type, int protocol)
{
return xs_create_sock(xprt, transport, PF_INET, type, protocol);
}
static struct socket *xs_create_sock6(struct rpc_xprt *xprt,
struct sock_xprt *transport, int type, int protocol)
{
return xs_create_sock(xprt, transport, PF_INET6, type, protocol);
}
static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
{
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
@ -1679,9 +1667,7 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
xs_udp_do_set_buffer_size(xprt);
}
static void xs_udp_setup_socket(struct sock_xprt *transport,
struct socket *(*create_sock)(struct rpc_xprt *,
struct sock_xprt *, int type, int protocol))
static void xs_udp_setup_socket(struct sock_xprt *transport, int family)
{
struct rpc_xprt *xprt = &transport->xprt;
struct socket *sock = transport->sock;
@ -1692,7 +1678,7 @@ static void xs_udp_setup_socket(struct sock_xprt *transport,
/* Start by resetting any existing state */
xs_reset_transport(transport);
sock = create_sock(xprt, transport, SOCK_DGRAM, IPPROTO_UDP);
sock = xs_create_sock(xprt, transport, family, SOCK_DGRAM, IPPROTO_UDP);
if (IS_ERR(sock))
goto out;
@ -1721,7 +1707,7 @@ static void xs_udp_connect_worker4(struct work_struct *work)
struct sock_xprt *transport =
container_of(work, struct sock_xprt, connect_worker.work);
xs_udp_setup_socket(transport, xs_create_sock4);
xs_udp_setup_socket(transport, PF_INET);
}
/**
@ -1736,7 +1722,7 @@ static void xs_udp_connect_worker6(struct work_struct *work)
struct sock_xprt *transport =
container_of(work, struct sock_xprt, connect_worker.work);
xs_udp_setup_socket(transport, xs_create_sock6);
xs_udp_setup_socket(transport, PF_INET6);
}
/*
@ -1840,9 +1826,7 @@ 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 sock_xprt *transport,
struct socket *(*create_sock)(struct rpc_xprt *,
struct sock_xprt *, int type, int protocol))
static void xs_tcp_setup_socket(struct sock_xprt *transport, int family)
{
struct socket *sock = transport->sock;
struct rpc_xprt *xprt = &transport->xprt;
@ -1853,7 +1837,7 @@ static void xs_tcp_setup_socket(struct sock_xprt *transport,
if (!sock) {
clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
sock = create_sock(xprt, transport, SOCK_STREAM, IPPROTO_TCP);
sock = xs_create_sock(xprt, transport, family, SOCK_STREAM, IPPROTO_TCP);
if (IS_ERR(sock)) {
status = PTR_ERR(sock);
goto out;
@ -1924,7 +1908,7 @@ static void xs_tcp_connect_worker4(struct work_struct *work)
struct sock_xprt *transport =
container_of(work, struct sock_xprt, connect_worker.work);
xs_tcp_setup_socket(transport, xs_create_sock4);
xs_tcp_setup_socket(transport, PF_INET);
}
/**
@ -1938,7 +1922,7 @@ static void xs_tcp_connect_worker6(struct work_struct *work)
struct sock_xprt *transport =
container_of(work, struct sock_xprt, connect_worker.work);
xs_tcp_setup_socket(transport, xs_create_sock6);
xs_tcp_setup_socket(transport, PF_INET6);
}
/**