From: Pavel Emelyanov <xemul@parallels.com>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: "linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>
Subject: [PATCH 8/13] sunrpc: Call xs_create_sockX directly from setup_socket
Date: Mon, 04 Oct 2010 16:55:38 +0400 [thread overview]
Message-ID: <4CA9CECA.6000700@parallels.com> (raw)
In-Reply-To: <4CA9CDA8.4010407@parallels.com>
Remove now unneeded wrappers that just add type and protocol
to socket creation callback.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
net/sunrpc/xprtsock.c | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 96128d0..7fdf2bb 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1710,7 +1710,7 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
static void xs_udp_setup_socket(struct sock_xprt *transport,
struct socket *(*create_sock)(struct rpc_xprt *,
- struct sock_xprt *))
+ struct sock_xprt *, int type, int protocol))
{
struct rpc_xprt *xprt = &transport->xprt;
struct socket *sock = transport->sock;
@@ -1721,7 +1721,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 = create_sock(xprt, transport, SOCK_DGRAM, IPPROTO_UDP);
if (IS_ERR(sock))
goto out;
@@ -1745,18 +1745,12 @@ out:
* Invoked by a work queue tasklet.
*/
-static struct socket *xs_create_udp_sock4(struct rpc_xprt *xprt,
- struct sock_xprt *transport)
-{
- return xs_create_sock4(xprt, transport, SOCK_DGRAM, IPPROTO_UDP);
-}
-
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_udp_sock4);
+ xs_udp_setup_socket(transport, xs_create_sock4);
}
/**
@@ -1766,18 +1760,12 @@ static void xs_udp_connect_worker4(struct work_struct *work)
* Invoked by a work queue tasklet.
*/
-static struct socket *xs_create_udp_sock6(struct rpc_xprt *xprt,
- struct sock_xprt *transport)
-{
- return xs_create_sock6(xprt, transport, SOCK_DGRAM, IPPROTO_UDP);
-}
-
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_udp_sock6);
+ xs_udp_setup_socket(transport, xs_create_sock6);
}
/*
@@ -1883,7 +1871,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock)
*/
static void xs_tcp_setup_socket(struct sock_xprt *transport,
struct socket *(*create_sock)(struct rpc_xprt *,
- struct sock_xprt *))
+ struct sock_xprt *, int type, int protocol))
{
struct socket *sock = transport->sock;
struct rpc_xprt *xprt = &transport->xprt;
@@ -1894,7 +1882,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 = create_sock(xprt, transport, SOCK_STREAM, IPPROTO_TCP);
if (IS_ERR(sock)) {
status = PTR_ERR(sock);
goto out;
@@ -1954,12 +1942,6 @@ out:
xprt_wake_pending_tasks(xprt, status);
}
-static struct socket *xs_create_tcp_sock4(struct rpc_xprt *xprt,
- struct sock_xprt *transport)
-{
- return xs_create_sock4(xprt, transport, SOCK_STREAM, IPPROTO_TCP);
-}
-
/**
* xs_tcp_connect_worker4 - connect a TCP socket to a remote endpoint
* @work: RPC transport to connect
@@ -1971,13 +1953,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_tcp_sock4);
-}
-
-static struct socket *xs_create_tcp_sock6(struct rpc_xprt *xprt,
- struct sock_xprt *transport)
-{
- return xs_create_sock6(xprt, transport, SOCK_STREAM, IPPROTO_TCP);
+ xs_tcp_setup_socket(transport, xs_create_sock4);
}
/**
@@ -1991,7 +1967,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_tcp_sock6);
+ xs_tcp_setup_socket(transport, xs_create_sock6);
}
/**
--
1.5.5.6
next prev parent reply other threads:[~2010-10-04 12:55 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-04 12:50 [PATCH 0/13] sunrpc: Compact the xprtsock code a bit Pavel Emelyanov
2010-10-04 12:51 ` [PATCH 1/13] sunrpc: Remove unused sock arg from xs_get_srcport Pavel Emelyanov
2010-10-04 12:51 ` [PATCH 2/13] sunrpc: Remove unused sock arg from xs_next_srcport Pavel Emelyanov
2010-10-04 12:52 ` [PATCH 3/13] sunrpc: Get xprt pointer once in xs_tcp_setup_socket Pavel Emelyanov
2010-10-04 12:52 ` [PATCH 4/13] sunrpc: Remove duplicate xprt/transport arguments from calls Pavel Emelyanov
2010-10-04 12:53 ` [PATCH 5/13] sunrpc: Factor out udp sockets creation Pavel Emelyanov
2010-10-04 12:54 ` [PATCH 6/13] sunrpc: Factor out v4 " Pavel Emelyanov
2010-10-04 12:54 ` [PATCH 7/13] sunrpc: Factor out v6 " Pavel Emelyanov
2010-10-04 12:55 ` Pavel Emelyanov [this message]
2010-10-04 12:56 ` [PATCH 9/13] sunrpc: Merge the xs_bind code Pavel Emelyanov
2010-10-05 3:20 ` Chuck Lever
2010-10-05 5:42 ` Pavel Emelyanov
2010-10-05 11:53 ` [PATCH v2 " Pavel Emelyanov
2010-10-06 3:04 ` Chuck Lever
2010-10-15 16:05 ` J. Bruce Fields
2010-10-15 16:24 ` Pavel Emelyanov
2010-10-15 16:39 ` Chuck Lever
2010-10-15 18:08 ` J. Bruce Fields
2010-10-15 18:09 ` J. Bruce Fields
2010-10-15 18:11 ` Chuck Lever
2010-10-18 21:15 ` J. Bruce Fields
2010-10-18 21:43 ` J. Bruce Fields
2010-10-18 21:53 ` Chuck Lever
2010-10-18 21:57 ` J. Bruce Fields
2010-10-18 22:37 ` Chuck Lever
2010-10-18 23:55 ` J. Bruce Fields
2010-10-19 14:35 ` Chuck Lever
2010-10-19 15:20 ` J. Bruce Fields
2010-10-20 9:19 ` Pavel Emelyanov
2010-10-04 12:56 ` [PATCH 10/13] sunrpc: Merge xs_create_sock code Pavel Emelyanov
2010-10-04 12:57 ` [PATCH 11/13] sunrpc: Pass family to setup_socket calls Pavel Emelyanov
2010-10-04 12:57 ` [PATCH 12/13] sunrpc: Remove TCP worker wrappers Pavel Emelyanov
2010-10-04 12:58 ` [PATCH 13/13] sunrpc: Remove UDP " Pavel Emelyanov
2010-10-11 23:47 ` [PATCH 0/13] sunrpc: Compact the xprtsock code a bit J. Bruce Fields
2010-10-12 7:51 ` Pavel Emelyanov
2010-10-12 13:50 ` J. Bruce Fields
2010-10-12 15:21 ` Pavel Emelyanov
2010-10-15 15:03 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CA9CECA.6000700@parallels.com \
--to=xemul@parallels.com \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).