iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sunrpc: Remove UDP worker wrappers

Browse Source 
Same for UDP sockets creation paths.

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:58:02 +04:00 committed by J. Bruce Fields
parent cdd518d524
commit 8c14ff2aaf
1 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
net/sunrpc/xprtsock.c
View File

@ -1667,8 +1667,10 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
xs_udp_do_set_buffer_size(xprt); xs_udp_do_set_buffer_size(xprt);
} }
static void xs_udp_setup_socket(struct sock_xprt *transport, int family) static void xs_udp_setup_socket(struct work_struct *work)
{ {
struct sock_xprt *transport =
container_of(work, struct sock_xprt, connect_worker.work);
struct rpc_xprt *xprt = &transport->xprt; struct rpc_xprt *xprt = &transport->xprt;
struct socket *sock = transport->sock; struct socket *sock = transport->sock;
int status = -EIO; int status = -EIO;
@ -1678,7 +1680,8 @@ static void xs_udp_setup_socket(struct sock_xprt *transport, int family)
/* Start by resetting any existing state */ /* Start by resetting any existing state */
xs_reset_transport(transport); xs_reset_transport(transport);
sock = xs_create_sock(xprt, transport, family, SOCK_DGRAM, IPPROTO_UDP); sock = xs_create_sock(xprt, transport,
xs_addr(xprt)->sa_family, SOCK_DGRAM, IPPROTO_UDP);
if (IS_ERR(sock)) if (IS_ERR(sock))
goto out; goto out;
@ -1695,36 +1698,6 @@ out:
xprt_wake_pending_tasks(xprt, status); xprt_wake_pending_tasks(xprt, status);
} }
/**
* xs_udp_connect_worker4 - set up a UDP socket
* @work: RPC transport to connect
*
* Invoked by a work queue tasklet.
*/
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, PF_INET);
}
/**
* xs_udp_connect_worker6 - set up a UDP socket
* @work: RPC transport to connect
*
* Invoked by a work queue tasklet.
*/
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, PF_INET6);
}
/* /*
* 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.
@ -2229,7 +2202,7 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args)
xprt_set_bound(xprt); xprt_set_bound(xprt);
INIT_DELAYED_WORK(&transport->connect_worker, INIT_DELAYED_WORK(&transport->connect_worker,
xs_udp_connect_worker4); xs_udp_setup_socket);
xs_format_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP); xs_format_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP);
break; break;
case AF_INET6: case AF_INET6:
@ -2237,7 +2210,7 @@ static struct rpc_xprt *xs_setup_udp(struct xprt_create *args)
xprt_set_bound(xprt); xprt_set_bound(xprt);
INIT_DELAYED_WORK(&transport->connect_worker, INIT_DELAYED_WORK(&transport->connect_worker,
xs_udp_connect_worker6); xs_udp_setup_socket);
xs_format_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP6); xs_format_peer_addresses(xprt, "udp", RPCBIND_NETID_UDP6);
break; break;
default: default: