Commit fc5d00b04a3a58cac8620403dfe9f43f72578ec1
Committed by
J. Bruce Fields
J. Bruce Fields
1 parent
e204e621b4
Exists in
master
and in
4 other branches
sunrpc: Add net argument to svc_create_xprt
Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Showing 6 changed files with 12 additions and 11 deletions Side-by-side Diff
fs/lockd/svc.c
| ... | ... | @@ -206,7 +206,7 @@ |
| 206 | 206 | |
| 207 | 207 | xprt = svc_find_xprt(serv, name, family, 0); |
| 208 | 208 | if (xprt == NULL) |
| 209 | - return svc_create_xprt(serv, name, family, port, | |
| 209 | + return svc_create_xprt(serv, name, &init_net, family, port, | |
| 210 | 210 | SVC_SOCK_DEFAULTS); |
| 211 | 211 | svc_xprt_put(xprt); |
| 212 | 212 | return 0; |
fs/nfs/callback.c
| ... | ... | @@ -109,7 +109,7 @@ |
| 109 | 109 | { |
| 110 | 110 | int ret; |
| 111 | 111 | |
| 112 | - ret = svc_create_xprt(serv, "tcp", PF_INET, | |
| 112 | + ret = svc_create_xprt(serv, "tcp", &init_net, PF_INET, | |
| 113 | 113 | nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); |
| 114 | 114 | if (ret <= 0) |
| 115 | 115 | goto out_err; |
| ... | ... | @@ -117,7 +117,7 @@ |
| 117 | 117 | dprintk("NFS: Callback listener port = %u (af %u)\n", |
| 118 | 118 | nfs_callback_tcpport, PF_INET); |
| 119 | 119 | |
| 120 | - ret = svc_create_xprt(serv, "tcp", PF_INET6, | |
| 120 | + ret = svc_create_xprt(serv, "tcp", &init_net, PF_INET6, | |
| 121 | 121 | nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); |
| 122 | 122 | if (ret > 0) { |
| 123 | 123 | nfs_callback_tcpport6 = ret; |
fs/nfsd/nfsctl.c
| ... | ... | @@ -1015,12 +1015,12 @@ |
| 1015 | 1015 | if (err != 0) |
| 1016 | 1016 | return err; |
| 1017 | 1017 | |
| 1018 | - err = svc_create_xprt(nfsd_serv, transport, | |
| 1018 | + err = svc_create_xprt(nfsd_serv, transport, &init_net, | |
| 1019 | 1019 | PF_INET, port, SVC_SOCK_ANONYMOUS); |
| 1020 | 1020 | if (err < 0) |
| 1021 | 1021 | goto out_err; |
| 1022 | 1022 | |
| 1023 | - err = svc_create_xprt(nfsd_serv, transport, | |
| 1023 | + err = svc_create_xprt(nfsd_serv, transport, &init_net, | |
| 1024 | 1024 | PF_INET6, port, SVC_SOCK_ANONYMOUS); |
| 1025 | 1025 | if (err < 0 && err != -EAFNOSUPPORT) |
| 1026 | 1026 | goto out_close; |
fs/nfsd/nfssvc.c
| ... | ... | @@ -16,6 +16,7 @@ |
| 16 | 16 | #include <linux/lockd/bind.h> |
| 17 | 17 | #include <linux/nfsacl.h> |
| 18 | 18 | #include <linux/seq_file.h> |
| 19 | +#include <net/net_namespace.h> | |
| 19 | 20 | #include "nfsd.h" |
| 20 | 21 | #include "cache.h" |
| 21 | 22 | #include "vfs.h" |
| 22 | 23 | |
| ... | ... | @@ -186,12 +187,12 @@ |
| 186 | 187 | if (!list_empty(&nfsd_serv->sv_permsocks)) |
| 187 | 188 | return 0; |
| 188 | 189 | |
| 189 | - error = svc_create_xprt(nfsd_serv, "udp", PF_INET, port, | |
| 190 | + error = svc_create_xprt(nfsd_serv, "udp", &init_net, PF_INET, port, | |
| 190 | 191 | SVC_SOCK_DEFAULTS); |
| 191 | 192 | if (error < 0) |
| 192 | 193 | return error; |
| 193 | 194 | |
| 194 | - error = svc_create_xprt(nfsd_serv, "tcp", PF_INET, port, | |
| 195 | + error = svc_create_xprt(nfsd_serv, "tcp", &init_net, PF_INET, port, | |
| 195 | 196 | SVC_SOCK_DEFAULTS); |
| 196 | 197 | if (error < 0) |
| 197 | 198 | return error; |
include/linux/sunrpc/svc_xprt.h
| ... | ... | @@ -74,8 +74,8 @@ |
| 74 | 74 | void svc_unreg_xprt_class(struct svc_xprt_class *); |
| 75 | 75 | void svc_xprt_init(struct svc_xprt_class *, struct svc_xprt *, |
| 76 | 76 | struct svc_serv *); |
| 77 | -int svc_create_xprt(struct svc_serv *, const char *, const int, | |
| 78 | - const unsigned short, int); | |
| 77 | +int svc_create_xprt(struct svc_serv *, const char *, struct net *, | |
| 78 | + const int, const unsigned short, int); | |
| 79 | 79 | void svc_xprt_enqueue(struct svc_xprt *xprt); |
| 80 | 80 | void svc_xprt_received(struct svc_xprt *); |
| 81 | 81 | void svc_xprt_put(struct svc_xprt *xprt); |
net/sunrpc/svc_xprt.c
| ... | ... | @@ -204,8 +204,8 @@ |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | int svc_create_xprt(struct svc_serv *serv, const char *xprt_name, |
| 207 | - const int family, const unsigned short port, | |
| 208 | - int flags) | |
| 207 | + struct net *net, const int family, | |
| 208 | + const unsigned short port, int flags) | |
| 209 | 209 | { |
| 210 | 210 | struct svc_xprt_class *xcl; |
| 211 | 211 |