mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

NFSv4.x: Fix up the global tracking of the callback server 

Ensure that the nfs_callback_info[] array correctly tracks the
struct svc_serv.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2016-08-29 20:03:50 -04:00 committed by Anna Schumaker
parent d002526886
commit 3b01c11ee8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfs/callback.c
View File

@ -201,7 +201,6 @@ static int nfs_callback_start_svc(int minorversion, struct rpc_xprt *xprt,
svc_sock_update_bufs(serv); svc_sock_update_bufs(serv);
cb_info->serv = serv;
cb_info->rqst = rqstp; cb_info->rqst = rqstp;
cb_info->task = kthread_create(serv->sv_ops->svo_function, cb_info->task = kthread_create(serv->sv_ops->svo_function,
cb_info->rqst, cb_info->rqst,
@ -300,7 +299,7 @@ static struct svc_serv *nfs_callback_create_svc(int minorversion)
/* /*
* Check whether we're already up and running. * Check whether we're already up and running.
*/ */
if (cb_info->task) { if (cb_info->serv) {
/* /*
* Note: increase service usage, because later in case of error * Note: increase service usage, because later in case of error
* svc_destroy() will be called. * svc_destroy() will be called.
@ -333,6 +332,7 @@ static struct svc_serv *nfs_callback_create_svc(int minorversion)
printk(KERN_ERR "nfs_callback_create_svc: create service failed\n"); printk(KERN_ERR "nfs_callback_create_svc: create service failed\n");
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
cb_info->serv = serv;
/* As there is only one thread we need to over-ride the /* As there is only one thread we need to over-ride the
* default maximum of 80 connections * default maximum of 80 connections
*/ */
@ -375,6 +375,8 @@ int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt)
* thread exits. * thread exits.
*/ */
err_net: err_net:
if (!cb_info->users)
cb_info->serv = NULL;
svc_destroy(serv); svc_destroy(serv);
err_create: err_create:
mutex_unlock(&nfs_callback_mutex); mutex_unlock(&nfs_callback_mutex);
@ -396,9 +398,11 @@ void nfs_callback_down(int minorversion, struct net *net)
mutex_lock(&nfs_callback_mutex); mutex_lock(&nfs_callback_mutex);
nfs_callback_down_net(minorversion, cb_info->serv, net); nfs_callback_down_net(minorversion, cb_info->serv, net);
cb_info->users--; cb_info->users--;
if (cb_info->users == 0 && cb_info->task != NULL) { if (cb_info->users == 0) {
kthread_stop(cb_info->task); if (cb_info->task != NULL) {
dprintk("nfs_callback_down: service stopped\n"); kthread_stop(cb_info->task);
dprintk("nfs_callback_down: service stopped\n");
}
svc_exit_thread(cb_info->rqst); svc_exit_thread(cb_info->rqst);
dprintk("nfs_callback_down: service destroyed\n"); dprintk("nfs_callback_down: service destroyed\n");
cb_info->serv = NULL; cb_info->serv = NULL;