iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd/sunrpc: abstract out svc_set_num_threads to sv_ops

Browse Source 
Add an operation that will do setup of the service. In the case of a
classic thread-based service that means starting up threads. In the case
of a workqueue-based service, the setup will do something different.

Signed-off-by: Shirley Ma <shirley.ma@oracle.com>
Acked-by: Jeff Layton <jlayton@primarydata.com>
Tested-by: Shirley Ma <shirliey.ma@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Jeff Layton 2015-06-08 12:08:33 -07:00 committed by J. Bruce Fields
parent b9e13cdfac
commit 598e235909
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfsd/nfssvc.c
View File

@ -395,6 +395,7 @@ static struct svc_serv_ops nfsd_thread_sv_ops = {
.svo_shutdown = nfsd_last_thread, .svo_shutdown = nfsd_last_thread,
.svo_function = nfsd, .svo_function = nfsd,
.svo_enqueue_xprt = svc_xprt_do_enqueue, .svo_enqueue_xprt = svc_xprt_do_enqueue,
.svo_setup = svc_set_num_threads,
.svo_module = THIS_MODULE, .svo_module = THIS_MODULE,
}; };
@ -507,8 +508,8 @@ int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
/* apply the new numbers */ /* apply the new numbers */
svc_get(nn->nfsd_serv); svc_get(nn->nfsd_serv);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
err = svc_set_num_threads(nn->nfsd_serv, &nn->nfsd_serv->sv_pools[i], err = nn->nfsd_serv->sv_ops->svo_setup(nn->nfsd_serv,
nthreads[i]); &nn->nfsd_serv->sv_pools[i], nthreads[i]);
if (err) if (err)
break; break;
} }
@ -547,7 +548,8 @@ nfsd_svc(int nrservs, struct net *net)
error = nfsd_startup_net(nrservs, net); error = nfsd_startup_net(nrservs, net);
if (error) if (error)
goto out_destroy; goto out_destroy;
error = svc_set_num_threads(nn->nfsd_serv, NULL, nrservs); error = nn->nfsd_serv->sv_ops->svo_setup(nn->nfsd_serv,
NULL, nrservs);
if (error) if (error)
goto out_shutdown; goto out_shutdown;
/* We are holding a reference to nn->nfsd_serv which /* We are holding a reference to nn->nfsd_serv which

3
include/linux/sunrpc/svc.h
View File

@ -61,6 +61,9 @@ struct svc_serv_ops {
/* queue up a transport for servicing */ /* queue up a transport for servicing */
void (*svo_enqueue_xprt)(struct svc_xprt *); void (*svo_enqueue_xprt)(struct svc_xprt *);
/* set up thread (or whatever) execution context */
int (*svo_setup)(struct svc_serv *, struct svc_pool *, int);
/* optional module to count when adding threads (pooled svcs only) */ /* optional module to count when adding threads (pooled svcs only) */
struct module *svo_module; struct module *svo_module;
}; };