diff options
| author | Pavel Emelyanov <xemul@parallels.com> | 2010-09-29 14:06:57 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-10-01 23:19:00 +0200 |
| commit | 14ec63c3336af7ea5445e0d8f4d26ba3041e40b3 (patch) | |
| tree | d81dee6a73cb604c90efd8add86e63a143bcd429 /net/sunrpc | |
| parent | net: Export __sock_create (diff) | |
| download | linux-14ec63c3336af7ea5445e0d8f4d26ba3041e40b3.tar.xz linux-14ec63c3336af7ea5445e0d8f4d26ba3041e40b3.zip | |
sunrpc: Create sockets in net namespaces
The context is already known in all the sock_create callers.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/svcsock.c | 2 | ||||
| -rw-r--r-- | 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 559338527f47..88de3d093165 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 4ef3a6a9445c..f9964ef35e3e 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); |