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>

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 94aa9d8f3086c743e20c07990d7ded21cde3eaa1..baafa0f1e555e9a95822536db4bc67b32a11fceb 100644 (file)
--- 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;

diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
index 1c167d1636832acac1b25ae5803f66fc02a47e83..c07a8d460d367e274685774b513c9ef8551e14c9 100644 (file)
--- a/fs/nfs/callback.h
+++ b/fs/nfs/callback.h
@@ -208,6 +208,5 @@ extern int nfs4_set_callback_sessionid(struct nfs_client *clp);
 #define NFS41_BC_MAX_CALLBACKS 1
 
 extern unsigned int nfs_callback_set_tcpport;
-extern unsigned short nfs_callback_tcpport6;
 
 #endif /* __LINUX_FS_NFS_CALLBACK_H */

diff --git a/fs/nfs/netns.h b/fs/nfs/netns.h
index 1538d3a83cde88dd84705867c4d223bfb75547db..137238b012fb76a2274c93de1e73a42db9ed7430 100644 (file)
--- a/fs/nfs/netns.h
+++ b/fs/nfs/netns.h
@@ -23,6 +23,7 @@ struct nfs_net {
 #if IS_ENABLED(CONFIG_NFS_V4)
        struct idr cb_ident_idr; /* Protected by nfs_client_lock */
        unsigned short nfs_callback_tcpport;
+       unsigned short nfs_callback_tcpport6;
 #endif
        spinlock_t nfs_client_lock;
        struct timespec boot_time;

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index 716cdc20475f729d11e1b13d70430cf93a320eae..bd8ed01cb0ea273c1551f58feab71e0913ff0da9 100644 (file)
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -80,7 +80,7 @@ int nfs4_init_clientid(struct nfs_client *clp, struct rpc_cred *cred)
                goto do_confirm;
        port = nn->nfs_callback_tcpport;
        if (clp->cl_addr.ss_family == AF_INET6)
-               port = nfs_callback_tcpport6;
+               port = nn->nfs_callback_tcpport6;
 
        status = nfs4_proc_setclientid(clp, NFS4_CALLBACK, port, cred, &clid);
        if (status != 0)