aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-08-06 11:57:43 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:16:15 -0400
commit9c3d72de28eed3e882becd7054da2118f8a73131 (patch)
tree0e96f484f5cd6f4f64c0af566e345c700c433089
parent16be2d20d999cb65daebfdaf0e560225e28fcb9d (diff)
SUNRPC: Rename IPv4 connect workers
Prepare for introduction of IPv6 versions of same. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--net/sunrpc/xprtsock.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index e8a5edf59912..a0c26b9ebb34 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1353,12 +1353,12 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
1353} 1353}
1354 1354
1355/** 1355/**
1356 * xs_udp_connect_worker - set up a UDP socket 1356 * xs_udp_connect_worker4 - set up a UDP socket
1357 * @work: RPC transport to connect 1357 * @work: RPC transport to connect
1358 * 1358 *
1359 * Invoked by a work queue tasklet. 1359 * Invoked by a work queue tasklet.
1360 */ 1360 */
1361static void xs_udp_connect_worker(struct work_struct *work) 1361static void xs_udp_connect_worker4(struct work_struct *work)
1362{ 1362{
1363 struct sock_xprt *transport = 1363 struct sock_xprt *transport =
1364 container_of(work, struct sock_xprt, connect_worker.work); 1364 container_of(work, struct sock_xprt, connect_worker.work);
@@ -1458,12 +1458,12 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
1458} 1458}
1459 1459
1460/** 1460/**
1461 * xs_tcp_connect_worker - connect a TCP socket to a remote endpoint 1461 * xs_tcp_connect_worker4 - connect a TCP socket to a remote endpoint
1462 * @work: RPC transport to connect 1462 * @work: RPC transport to connect
1463 * 1463 *
1464 * Invoked by a work queue tasklet. 1464 * Invoked by a work queue tasklet.
1465 */ 1465 */
1466static void xs_tcp_connect_worker(struct work_struct *work) 1466static void xs_tcp_connect_worker4(struct work_struct *work)
1467{ 1467{
1468 struct sock_xprt *transport = 1468 struct sock_xprt *transport =
1469 container_of(work, struct sock_xprt, connect_worker.work); 1469 container_of(work, struct sock_xprt, connect_worker.work);
@@ -1695,7 +1695,7 @@ struct rpc_xprt *xs_setup_udp(struct rpc_xprtsock_create *args)
1695 /* XXX: header size can vary due to auth type, IPv6, etc. */ 1695 /* XXX: header size can vary due to auth type, IPv6, etc. */
1696 xprt->max_payload = (1U << 16) - (MAX_HEADER << 3); 1696 xprt->max_payload = (1U << 16) - (MAX_HEADER << 3);
1697 1697
1698 INIT_DELAYED_WORK(&transport->connect_worker, xs_udp_connect_worker); 1698 INIT_DELAYED_WORK(&transport->connect_worker, xs_udp_connect_worker4);
1699 xprt->bind_timeout = XS_BIND_TO; 1699 xprt->bind_timeout = XS_BIND_TO;
1700 xprt->connect_timeout = XS_UDP_CONN_TO; 1700 xprt->connect_timeout = XS_UDP_CONN_TO;
1701 xprt->reestablish_timeout = XS_UDP_REEST_TO; 1701 xprt->reestablish_timeout = XS_UDP_REEST_TO;
@@ -1737,7 +1737,7 @@ struct rpc_xprt *xs_setup_tcp(struct rpc_xprtsock_create *args)
1737 xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32); 1737 xprt->tsh_size = sizeof(rpc_fraghdr) / sizeof(u32);
1738 xprt->max_payload = RPC_MAX_FRAGMENT_SIZE; 1738 xprt->max_payload = RPC_MAX_FRAGMENT_SIZE;
1739 1739
1740 INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker); 1740 INIT_DELAYED_WORK(&transport->connect_worker, xs_tcp_connect_worker4);
1741 xprt->bind_timeout = XS_BIND_TO; 1741 xprt->bind_timeout = XS_BIND_TO;
1742 xprt->connect_timeout = XS_TCP_CONN_TO; 1742 xprt->connect_timeout = XS_TCP_CONN_TO;
1743 xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO; 1743 xprt->reestablish_timeout = XS_TCP_INIT_REEST_TO;