From: Pavel Emelyanov <xemul@parallels.com>
To: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Chuck Lever <chuck.lever@oracle.com>,
Trond Myklebust <Trond.Myklebust@netapp.com>,
linux-nfs@vger.kernel.org
Subject: [PATCH 9/9] sunrpc: Create sockets in net namespaces
Date: Wed, 29 Sep 2010 16:06:57 +0400 [thread overview]
Message-ID: <4CA32BE1.8010800@parallels.com> (raw)
In-Reply-To: <4CA32AB4.2090808@parallels.com>
The context is already known in all the sock_create callers.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
---
net/sunrpc/svcsock.c | 2 +-
net/sunrpc/xprtsock.c | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 5593385..88de3d0 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -1425,7 +1425,7 @@ static struct svc_xprt *svc_create_socket(struct svc_serv *serv,
return ERR_PTR(-EINVAL);
}
- error = sock_create_kern(family, type, protocol, &sock);
+ error = __sock_create(net, family, type, protocol, &sock, 1);
if (error < 0)
return ERR_PTR(error);
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 4ef3a6a..f9964ef 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -1680,7 +1680,7 @@ static void xs_udp_connect_worker4(struct work_struct *work)
/* Start by resetting any existing state */
xs_reset_transport(transport);
- err = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock);
+ err = __sock_create(xprt->xprt_net, PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
if (err < 0) {
dprintk("RPC: can't create UDP transport socket (%d).\n", -err);
goto out;
@@ -1725,7 +1725,7 @@ static void xs_udp_connect_worker6(struct work_struct *work)
/* Start by resetting any existing state */
xs_reset_transport(transport);
- err = sock_create_kern(PF_INET6, SOCK_DGRAM, IPPROTO_UDP, &sock);
+ err = __sock_create(xprt->xprt_net, PF_INET6, SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
if (err < 0) {
dprintk("RPC: can't create UDP transport socket (%d).\n", -err);
goto out;
@@ -1931,7 +1931,7 @@ static struct socket *xs_create_tcp_sock4(struct rpc_xprt *xprt,
int err;
/* start from scratch */
- err = sock_create_kern(PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock);
+ err = __sock_create(xprt->xprt_net, PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock, 1);
if (err < 0) {
dprintk("RPC: can't create TCP transport socket (%d).\n",
-err);
@@ -1970,7 +1970,7 @@ static struct socket *xs_create_tcp_sock6(struct rpc_xprt *xprt,
int err;
/* start from scratch */
- err = sock_create_kern(PF_INET6, SOCK_STREAM, IPPROTO_TCP, &sock);
+ err = __sock_create(xprt->xprt_net, PF_INET6, SOCK_STREAM, IPPROTO_TCP, &sock, 1);
if (err < 0) {
dprintk("RPC: can't create TCP transport socket (%d).\n",
-err);
--
1.5.5.6
next prev parent reply other threads:[~2010-09-29 12:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-29 12:01 [PATCH v3 0/9] sunrpc: Create sockets in namespaces Pavel Emelyanov
2010-09-29 12:02 ` [PATCH 1/9] sunrpc: Factor out rpc_xprt allocation Pavel Emelyanov
2010-09-29 12:03 ` [PATCH 2/9] sunrpc: Factor out rpc_xprt freeing Pavel Emelyanov
2010-09-29 12:03 ` [PATCH 3/9] sunrpc: Add net argument to svc_create_xprt Pavel Emelyanov
2010-09-29 12:04 ` [PATCH 4/9] sunrpc: Pull net argument downto svc_create_socket Pavel Emelyanov
2010-09-29 12:04 ` [PATCH 5/9] sunrpc: Add net to rpc_create_args Pavel Emelyanov
2010-09-29 12:05 ` [PATCH 6/9] sunrpc: Add net to xprt_create Pavel Emelyanov
2010-09-29 12:05 ` [PATCH 7/9] sunrpc: Tag rpc_xprt with net Pavel Emelyanov
2010-09-29 12:06 ` [PATCH 8/9] net: Export __sock_create Pavel Emelyanov
2010-09-29 12:06 ` Pavel Emelyanov [this message]
2010-09-29 21:45 ` [PATCH v3 0/9] sunrpc: Create sockets in namespaces J. Bruce Fields
2010-09-29 21:49 ` Chuck Lever
2010-09-30 5:46 ` Pavel Emelyanov
2010-09-30 15:16 ` Chuck Lever
2010-09-30 15:34 ` Pavel Emelyanov
2010-10-01 22:05 ` J. Bruce Fields
2011-07-20 21:10 ` J. Bruce Fields
2011-07-21 7:50 ` Pavel Emelyanov
2011-07-21 16:30 ` 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=4CA32BE1.8010800@parallels.com \
--to=xemul@parallels.com \
--cc=Trond.Myklebust@netapp.com \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--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).