diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-08-20 18:00:41 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-02 02:25:51 +0400 |
| commit | 29dcc16a8e29371e11fb58fc1292e01f30ff13c5 (patch) | |
| tree | c5e901f6c5c76dbf916ecb5196c6cdb527f38ef8 /fs/nfs/callback.c | |
| parent | bbe0a3aa4e227c8aae02a484ce1c0b655cd19055 (diff) | |
| download | linux-29dcc16a8e29371e11fb58fc1292e01f30ff13c5.tar.xz | |
NFS: make nfs_callback_tcpport6 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, 2 insertions, 4 deletions
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index 94aa9d8f3086..baafa0f1e555 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c @@ -38,8 +38,6 @@ static struct nfs_callback_data nfs_callback_info[NFS4_MAX_MINOR_VERSION + 1]; static DEFINE_MUTEX(nfs_callback_mutex); static struct svc_program nfs4_callback_program; -unsigned short nfs_callback_tcpport6; - static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) { int ret; @@ -56,9 +54,9 @@ static int nfs4_callback_up_net(struct svc_serv *serv, struct net *net) ret = svc_create_xprt(serv, "tcp", net, PF_INET6, nfs_callback_set_tcpport, SVC_SOCK_ANONYMOUS); if (ret > 0) { - nfs_callback_tcpport6 = ret; + nn->nfs_callback_tcpport6 = ret; dprintk("NFS: Callback listener port = %u (af %u, net %p)\n", - nfs_callback_tcpport6, PF_INET6, net); + nn->nfs_callback_tcpport6, PF_INET6, net); } else if (ret != -EAFNOSUPPORT) goto out_err; return 0; |