diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-08-20 18:00:36 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 15:25:47 -0700 |
| commit | bbe0a3aa4e227c8aae02a484ce1c0b655cd19055 (patch) | |
| tree | 22b02b554f7b3abea3fabb92f3856aec7e84b762 /fs/nfs/callback.c | |
| parent | 23c20ecd44750dd42e5fd53285a17ca8d8a9b0a3 (diff) | |
| download | op-kernel-dev-bbe0a3aa4e227c8aae02a484ce1c0b655cd19055.zip op-kernel-dev-bbe0a3aa4e227c8aae02a484ce1c0b655cd19055.tar.gz | |
NFS: make nfs_callback_tcpport per network context
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/callback.c')
| -rw-r--r-- | fs/nfs/callback.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 64e87ec..94aa9d8 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -23,6 +23,7 @@ #include "nfs4_fs.h" #include "callback.h" #include "internal.h" +#include "netns.h" #define NFSDBG_FACILITY NFSDBG_CALLBACK @@ -42,14 +43,15 @@ unsigned short nfs_callback_tcpport6; static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) { int ret; + struct nfs_net *nn = net_generic(net, nfs_net_id); ret = svc_create_xprt(serv, "tcp", net, PF_INET, nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); if (ret <= 0) goto out_err; - nfs_callback_tcpport = ret; + nn->nfs_callback_tcpport = ret; dprintk("NFS: Callback listener port = %u (af %u, net %p)\n", - nfs_callback_tcpport, PF_INET, net); + nn->nfs_callback_tcpport, PF_INET, net); ret = svc_create_xprt(serv, "tcp", net, PF_INET6, nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); |
