aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@parallels.com>2010-09-29 08:06:57 -0400
committerJ. Bruce Fields <bfields@redhat.com>2010-10-01 17:19:00 -0400
commit14ec63c3336af7ea5445e0d8f4d26ba3041e40b3 (patch)
treed81dee6a73cb604c90efd8add86e63a143bcd429 /net
parent721db93a55dad71bb89e7d11cc6be1f180ec3f2d (diff)
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')
-rw-r--r--net/sunrpc/svcsock.c2
-rw-r--r--net/sunrpc/xprtsock.c8
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,
1425 return ERR_PTR(-EINVAL); 1425 return ERR_PTR(-EINVAL);
1426 } 1426 }
1427 1427
1428 error = sock_create_kern(family, type, protocol, &sock); 1428 error = __sock_create(net, family, type, protocol, &sock, 1);
1429 if (error < 0) 1429 if (error < 0)
1430 return ERR_PTR(error); 1430 return ERR_PTR(error);
1431 1431
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)
1680 /* Start by resetting any existing state */ 1680 /* Start by resetting any existing state */
1681 xs_reset_transport(transport); 1681 xs_reset_transport(transport);
1682 1682
1683 err = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock); 1683 err = __sock_create(xprt->xprt_net, PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
1684 if (err < 0) { 1684 if (err < 0) {
1685 dprintk("RPC: can't create UDP transport socket (%d).\n", -err); 1685 dprintk("RPC: can't create UDP transport socket (%d).\n", -err);
1686 goto out; 1686 goto out;
@@ -1725,7 +1725,7 @@ static void xs_udp_connect_worker6(struct work_struct *work)
1725 /* Start by resetting any existing state */ 1725 /* Start by resetting any existing state */
1726 xs_reset_transport(transport); 1726 xs_reset_transport(transport);
1727 1727
1728 err = sock_create_kern(PF_INET6, SOCK_DGRAM, IPPROTO_UDP, &sock); 1728 err = __sock_create(xprt->xprt_net, PF_INET6, SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
1729 if (err < 0) { 1729 if (err < 0) {
1730 dprintk("RPC: can't create UDP transport socket (%d).\n", -err); 1730 dprintk("RPC: can't create UDP transport socket (%d).\n", -err);
1731 goto out; 1731 goto out;
@@ -1931,7 +1931,7 @@ static struct socket *xs_create_tcp_sock4(struct rpc_xprt *xprt,
1931 int err; 1931 int err;
1932 1932
1933 /* start from scratch */ 1933 /* start from scratch */
1934 err = sock_create_kern(PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock); 1934 err = __sock_create(xprt->xprt_net, PF_INET, SOCK_STREAM, IPPROTO_TCP, &sock, 1);
1935 if (err < 0) { 1935 if (err < 0) {
1936 dprintk("RPC: can't create TCP transport socket (%d).\n", 1936 dprintk("RPC: can't create TCP transport socket (%d).\n",
1937 -err); 1937 -err);
@@ -1970,7 +1970,7 @@ static struct socket *xs_create_tcp_sock6(struct rpc_xprt *xprt,
1970 int err; 1970 int err;
1971 1971
1972 /* start from scratch */ 1972 /* start from scratch */
1973 err = sock_create_kern(PF_INET6, SOCK_STREAM, IPPROTO_TCP, &sock); 1973 err = __sock_create(xprt->xprt_net, PF_INET6, SOCK_STREAM, IPPROTO_TCP, &sock, 1);
1974 if (err < 0) { 1974 if (err < 0) {
1975 dprintk("RPC: can't create TCP transport socket (%d).\n", 1975 dprintk("RPC: can't create TCP transport socket (%d).\n",
1976 -err); 1976 -err);