diff options
author | Pavel Emelyanov <xemul@parallels.com> | 2010-09-29 08:04:18 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2010-10-01 17:18:55 -0400 |
commit | 62832c039eab9d03cd28a66427ce8276988f28b0 (patch) | |
tree | 47d0b7fbd5ca567aa31661146ba16218149d67c8 /net/sunrpc/svc_xprt.c | |
parent | fc5d00b04a3a58cac8620403dfe9f43f72578ec1 (diff) |
sunrpc: Pull net argument downto svc_create_socket
After this the socket creation in it knows the context.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc/svc_xprt.c')
-rw-r--r-- | net/sunrpc/svc_xprt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c index d80789a37d88..678b6ee4da7b 100644 --- a/net/sunrpc/svc_xprt.c +++ b/net/sunrpc/svc_xprt.c | |||
@@ -166,6 +166,7 @@ EXPORT_SYMBOL_GPL(svc_xprt_init); | |||
166 | 166 | ||
167 | static struct svc_xprt *__svc_xpo_create(struct svc_xprt_class *xcl, | 167 | static struct svc_xprt *__svc_xpo_create(struct svc_xprt_class *xcl, |
168 | struct svc_serv *serv, | 168 | struct svc_serv *serv, |
169 | struct net *net, | ||
169 | const int family, | 170 | const int family, |
170 | const unsigned short port, | 171 | const unsigned short port, |
171 | int flags) | 172 | int flags) |
@@ -200,7 +201,7 @@ static struct svc_xprt *__svc_xpo_create(struct svc_xprt_class *xcl, | |||
200 | return ERR_PTR(-EAFNOSUPPORT); | 201 | return ERR_PTR(-EAFNOSUPPORT); |
201 | } | 202 | } |
202 | 203 | ||
203 | return xcl->xcl_ops->xpo_create(serv, sap, len, flags); | 204 | return xcl->xcl_ops->xpo_create(serv, net, sap, len, flags); |
204 | } | 205 | } |
205 | 206 | ||
206 | int svc_create_xprt(struct svc_serv *serv, const char *xprt_name, | 207 | int svc_create_xprt(struct svc_serv *serv, const char *xprt_name, |
@@ -221,7 +222,7 @@ int svc_create_xprt(struct svc_serv *serv, const char *xprt_name, | |||
221 | goto err; | 222 | goto err; |
222 | 223 | ||
223 | spin_unlock(&svc_xprt_class_lock); | 224 | spin_unlock(&svc_xprt_class_lock); |
224 | newxprt = __svc_xpo_create(xcl, serv, family, port, flags); | 225 | newxprt = __svc_xpo_create(xcl, serv, net, family, port, flags); |
225 | if (IS_ERR(newxprt)) { | 226 | if (IS_ERR(newxprt)) { |
226 | module_put(xcl->xcl_owner); | 227 | module_put(xcl->xcl_owner); |
227 | return PTR_ERR(newxprt); | 228 | return PTR_ERR(newxprt); |