NFSv4: Fix the minor version callback channel startup

[deliverable/linux.git] / fs / nfs / callback.c

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 64e87ec045aabaada9cf4f4733cb51ea6d8e4955..2245bef50f37a847b366387a6dc6d0e2d30e1f2f 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -12,6 +12,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcsock.h>
 #include <linux/nfs_fs.h>
+#include <linux/errno.h>
 #include <linux/mutex.h>
 #include <linux/freezer.h>
 #include <linux/kthread.h>
@@ -23,6 +24,7 @@
 #include "nfs4_fs.h"
 #include "callback.h"
 #include "internal.h"
+#include "netns.h"
 
 #define NFSDBG_FACILITY NFSDBG_CALLBACK
 
@@ -37,26 +39,25 @@ 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;
+       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);
        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;
@@ -177,15 +178,11 @@ nfs41_callback_up(struct svc_serv *serv)
        return rqstp;
 }
 
-static inline int nfs_minorversion_callback_svc_setup(u32 minorversion,
-               struct svc_serv *serv,
+static void nfs_minorversion_callback_svc_setup(struct svc_serv *serv,
                struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
 {
-       if (minorversion) {
-               *rqstpp = nfs41_callback_up(serv);
-               *callback_svc = nfs41_callback_svc;
-       }
-       return minorversion;
+       *rqstpp = nfs41_callback_up(serv);
+       *callback_svc = nfs41_callback_svc;
 }
 
 static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
@@ -204,11 +201,11 @@ static int nfs41_callback_up_net(struct svc_serv *serv, struct net *net)
        return 0;
 }
 
-static inline int nfs_minorversion_callback_svc_setup(u32 minorversion,
-               struct svc_serv *serv,
+static void nfs_minorversion_callback_svc_setup(struct svc_serv *serv,
                struct svc_rqst **rqstpp, int (**callback_svc)(void *vrqstp))
 {
-       return 0;
+       *rqstpp = ERR_PTR(-ENOTSUPP);
+       *callback_svc = ERR_PTR(-ENOTSUPP);
 }
 
 static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
@@ -225,19 +222,21 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
        struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
        char svc_name[12];
        int ret;
-       int minorversion_setup;
 
        nfs_callback_bc_serv(minorversion, xprt, serv);
 
        if (cb_info->task)
                return 0;
 
-       minorversion_setup =  nfs_minorversion_callback_svc_setup(minorversion,
-                                       serv, &rqstp, &callback_svc);
-       if (!minorversion_setup) {
+       switch (minorversion) {
+       case 0:
                /* v4.0 callback setup */
                rqstp = nfs4_callback_up(serv);
                callback_svc = nfs4_callback_svc;
+               break;
+       default:
+               nfs_minorversion_callback_svc_setup(serv,
+                               &rqstp, &callback_svc);
        }
 
        if (IS_ERR(rqstp))
@@ -260,10 +259,25 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
        return 0;
 }
 
+static void nfs_callback_down_net(u32 minorversion, struct svc_serv *serv, struct net *net)
+{
+       struct nfs_net *nn = net_generic(net, nfs_net_id);
+
+       if (--nn->cb_users[minorversion])
+               return;
+
+       dprintk("NFS: destroy per-net callback data; net=%p\n", net);
+       svc_shutdown_net(serv, net);
+}
+
 static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct net *net)
 {
+       struct nfs_net *nn = net_generic(net, nfs_net_id);
        int ret;
 
+       if (nn->cb_users[minorversion]++)
+               return 0;
+
        dprintk("NFS: create per-net callback data; net=%p\n", net);
 
        ret = svc_bind(serv, net);
@@ -378,7 +392,7 @@ err_create:
        return ret;
 
 err_start:
-       svc_shutdown_net(serv, net);
+       nfs_callback_down_net(minorversion, serv, net);
        dprintk("NFS: Couldn't create server thread; err = %d\n", ret);
        goto err_net;
 }
@@ -391,11 +405,13 @@ void nfs_callback_down(int minorversion, struct net *net)
        struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
 
        mutex_lock(&nfs_callback_mutex);
+       nfs_callback_down_net(minorversion, cb_info->serv, net);
        cb_info->users--;
        if (cb_info->users == 0 && cb_info->task != NULL) {
                kthread_stop(cb_info->task);
-               svc_shutdown_net(cb_info->serv, net);
+               dprintk("nfs_callback_down: service stopped\n");
                svc_exit_thread(cb_info->rqst);
+               dprintk("nfs_callback_down: service destroyed\n");
                cb_info->serv = NULL;
                cb_info->rqst = NULL;
                cb_info->task = NULL;