NFS: callback service creation function introduced

[pandora-kernel.git] / fs / nfs / callback.c

diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
index 23ff18f..18efeb5 100644 (file)
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -37,31 +37,7 @@ 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 int nfs_callback_set_tcpport;
-unsigned short nfs_callback_tcpport;
 unsigned short nfs_callback_tcpport6;
-#define NFS_CALLBACK_MAXPORTNR (65535U)
-
-static int param_set_portnr(const char *val, const struct kernel_param *kp)
-{
-       unsigned long num;
-       int ret;
-
-       if (!val)
-               return -EINVAL;
-       ret = strict_strtoul(val, 0, &num);
-       if (ret == -EINVAL || num > NFS_CALLBACK_MAXPORTNR)
-               return -EINVAL;
-       *((unsigned int *)kp->arg) = num;
-       return 0;
-}
-static struct kernel_param_ops param_ops_portnr = {
-       .set = param_set_portnr,
-       .get = param_get_uint,
-};
-#define param_check_portnr(name, p) __param_check(name, p, unsigned int);
-
-module_param_named(callback_tcpport, nfs_callback_set_tcpport, portnr, 0644);
 
 /*
  * This is the NFSv4 callback kernel thread.
@@ -241,12 +217,50 @@ static inline void nfs_callback_bc_serv(u32 minorversion, struct rpc_xprt *xprt,
 }
 #endif /* CONFIG_NFS_V4_1 */
 
+static struct svc_serv *nfs_callback_create_svc(int minorversion)
+{
+       struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
+       struct svc_serv *serv;
+
+       /*
+        * Check whether we're already up and running.
+        */
+       if (cb_info->task) {
+               /*
+                * Note: increase service usage, because later in case of error
+                * svc_destroy() will be called.
+                */
+               svc_get(cb_info->serv);
+               return cb_info->serv;
+       }
+
+       /*
+        * Sanity check: if there's no task,
+        * we should be the first user ...
+        */
+       if (cb_info->users)
+               printk(KERN_WARNING "nfs_callback_create_svc: no kthread, %d users??\n",
+                       cb_info->users);
+
+       serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
+       if (!serv) {
+               printk(KERN_ERR "nfs_callback_create_svc: create service failed\n");
+               return ERR_PTR(-ENOMEM);
+       }
+       /* As there is only one thread we need to over-ride the
+        * default maximum of 80 connections
+        */
+       serv->sv_maxconn = 1024;
+       dprintk("nfs_callback_create_svc: service created\n");
+       return serv;
+}
+
 /*
  * Bring up the callback thread if it is not already up.
  */
 int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
 {
-       struct svc_serv *serv = NULL;
+       struct svc_serv *serv;
        struct svc_rqst *rqstp;
        int (*callback_svc)(void *vrqstp);
        struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
@@ -256,15 +270,17 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
        struct net *net = &init_net;
 
        mutex_lock(&nfs_callback_mutex);
+
+       serv = nfs_callback_create_svc(minorversion);
+       if (IS_ERR(serv)) {
+               ret = PTR_ERR(serv);
+               goto err_create;
+       }
+
        if (cb_info->users++ || cb_info->task != NULL) {
                nfs_callback_bc_serv(minorversion, xprt, cb_info);
                goto out;
        }
-       serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
-       if (!serv) {
-               ret = -ENOMEM;
-               goto out_err;
-       }
 
        ret = svc_bind(serv, net);
        if (ret < 0) {
@@ -305,23 +321,22 @@ out:
         * on both success and failure so that the refcount is 1 when the
         * thread exits.
         */
-       if (serv)
-               svc_destroy(serv);
+       svc_destroy(serv);
+err_create:
        mutex_unlock(&nfs_callback_mutex);
        return ret;
 out_err:
        dprintk("NFS: Couldn't create callback socket or server thread; "
                "err = %d\n", ret);
        cb_info->users--;
-       if (serv)
-               svc_shutdown_net(serv, net);
+       svc_shutdown_net(serv, net);
        goto out;
 }
 
 /*
  * Kill the callback thread if it's no longer being used.
  */
-void nfs_callback_down(int minorversion)
+void nfs_callback_down(int minorversion, struct net *net)
 {
        struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
 
@@ -329,7 +344,7 @@ void nfs_callback_down(int minorversion)
        cb_info->users--;
        if (cb_info->users == 0 && cb_info->task != NULL) {
                kthread_stop(cb_info->task);
-               svc_shutdown_net(cb_info->serv, &init_net);
+               svc_shutdown_net(cb_info->serv, net);
                svc_exit_thread(cb_info->rqst);
                cb_info->serv = NULL;
                cb_info->rqst = NULL;