NFS: callback up - users counting cleanup
Usage coutner now increased only is the service was started sccessfully.
Even if service is running already, then goto is not required anymore, because
service creation and start will be skipped.
With this patch code looks clearer.
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 5d5f9d1..64e87ec 100644
--- a/fs/nfs/callback.c
+++ b/fs/nfs/callback.c
@@ -229,6 +229,9 @@
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) {
@@ -292,6 +295,8 @@
err_socks:
svc_rpcb_cleanup(serv, net);
err_bind:
+ dprintk("NFS: Couldn't create callback socket: err = %d; "
+ "net = %p\n", ret, net);
return ret;
}
@@ -340,7 +345,7 @@
{
struct svc_serv *serv;
struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
- int ret = 0;
+ int ret;
struct net *net = xprt->xprt_net;
mutex_lock(&nfs_callback_mutex);
@@ -351,11 +356,6 @@
goto err_create;
}
- if (cb_info->users++ || cb_info->task != NULL) {
- nfs_callback_bc_serv(minorversion, xprt, serv);
- goto out;
- }
-
ret = nfs_callback_up_net(minorversion, serv, net);
if (ret < 0)
goto err_net;
@@ -364,13 +364,14 @@
if (ret < 0)
goto err_start;
-out:
+ cb_info->users++;
/*
* svc_create creates the svc_serv with sv_nrthreads == 1, and then
* svc_prepare_thread increments that. So we need to call svc_destroy
* on both success and failure so that the refcount is 1 when the
* thread exits.
*/
+err_net:
svc_destroy(serv);
err_create:
mutex_unlock(&nfs_callback_mutex);
@@ -378,11 +379,8 @@
err_start:
svc_shutdown_net(serv, net);
-err_net:
- dprintk("NFS: Couldn't create callback socket or server thread; "
- "err = %d\n", ret);
- cb_info->users--;
- goto out;
+ dprintk("NFS: Couldn't create server thread; err = %d\n", ret);
+ goto err_net;
}
/*