mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
nfsd/sunrpc: add a new svc_serv_ops struct and move sv_shutdown into it
In later patches we'll need to abstract out more operations on a per-service level, besides sv_shutdown and sv_function. Declare a new svc_serv_ops struct to hold these operations, and move sv_shutdown into this struct. Signed-off-by: Shirley Ma <shirley.ma@oracle.com> Acked-by: Jeff Layton <jlayton@primarydata.com> Tested-by: Shirley Ma <shirley.ma@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
cc9a903d91
commit
ea126e7435
5 changed files with 33 additions and 22 deletions
|
@ -322,6 +322,10 @@ static int lockd_start_svc(struct svc_serv *serv)
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct svc_serv_ops lockd_sv_ops = {
|
||||||
|
.svo_shutdown = svc_rpcb_cleanup,
|
||||||
|
};
|
||||||
|
|
||||||
static struct svc_serv *lockd_create_svc(void)
|
static struct svc_serv *lockd_create_svc(void)
|
||||||
{
|
{
|
||||||
struct svc_serv *serv;
|
struct svc_serv *serv;
|
||||||
|
@ -350,7 +354,7 @@ static struct svc_serv *lockd_create_svc(void)
|
||||||
nlm_timeout = LOCKD_DFLT_TIMEO;
|
nlm_timeout = LOCKD_DFLT_TIMEO;
|
||||||
nlmsvc_timeout = nlm_timeout * HZ;
|
nlmsvc_timeout = nlm_timeout * HZ;
|
||||||
|
|
||||||
serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, svc_rpcb_cleanup);
|
serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, &lockd_sv_ops);
|
||||||
if (!serv) {
|
if (!serv) {
|
||||||
printk(KERN_WARNING "lockd_up: create service failed\n");
|
printk(KERN_WARNING "lockd_up: create service failed\n");
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-ENOMEM);
|
||||||
|
|
|
@ -308,6 +308,9 @@ static int nfs_callback_up_net(int minorversion, struct svc_serv *serv, struct n
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct svc_serv_ops nfs_cb_sv_ops = {
|
||||||
|
};
|
||||||
|
|
||||||
static struct svc_serv *nfs_callback_create_svc(int minorversion)
|
static struct svc_serv *nfs_callback_create_svc(int minorversion)
|
||||||
{
|
{
|
||||||
struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
|
struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];
|
||||||
|
@ -333,7 +336,7 @@ static struct svc_serv *nfs_callback_create_svc(int minorversion)
|
||||||
printk(KERN_WARNING "nfs_callback_create_svc: no kthread, %d users??\n",
|
printk(KERN_WARNING "nfs_callback_create_svc: no kthread, %d users??\n",
|
||||||
cb_info->users);
|
cb_info->users);
|
||||||
|
|
||||||
serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL);
|
serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, &nfs_cb_sv_ops);
|
||||||
if (!serv) {
|
if (!serv) {
|
||||||
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);
|
||||||
|
|
|
@ -391,6 +391,10 @@ static int nfsd_get_default_max_blksize(void)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct svc_serv_ops nfsd_sv_ops = {
|
||||||
|
.svo_shutdown = nfsd_last_thread,
|
||||||
|
};
|
||||||
|
|
||||||
int nfsd_create_serv(struct net *net)
|
int nfsd_create_serv(struct net *net)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
@ -405,7 +409,7 @@ int nfsd_create_serv(struct net *net)
|
||||||
nfsd_max_blksize = nfsd_get_default_max_blksize();
|
nfsd_max_blksize = nfsd_get_default_max_blksize();
|
||||||
nfsd_reset_versions();
|
nfsd_reset_versions();
|
||||||
nn->nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,
|
nn->nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,
|
||||||
nfsd_last_thread, nfsd, THIS_MODULE);
|
&nfsd_sv_ops, nfsd, THIS_MODULE);
|
||||||
if (nn->nfsd_serv == NULL)
|
if (nn->nfsd_serv == NULL)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
|
|
@ -54,6 +54,13 @@ struct svc_pool {
|
||||||
unsigned long sp_flags;
|
unsigned long sp_flags;
|
||||||
} ____cacheline_aligned_in_smp;
|
} ____cacheline_aligned_in_smp;
|
||||||
|
|
||||||
|
struct svc_serv;
|
||||||
|
|
||||||
|
struct svc_serv_ops {
|
||||||
|
/* Callback to use when last thread exits. */
|
||||||
|
void (*svo_shutdown)(struct svc_serv *serv, struct net *net);
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* RPC service.
|
* RPC service.
|
||||||
*
|
*
|
||||||
|
@ -85,13 +92,7 @@ struct svc_serv {
|
||||||
|
|
||||||
unsigned int sv_nrpools; /* number of thread pools */
|
unsigned int sv_nrpools; /* number of thread pools */
|
||||||
struct svc_pool * sv_pools; /* array of thread pools */
|
struct svc_pool * sv_pools; /* array of thread pools */
|
||||||
|
struct svc_serv_ops *sv_ops; /* server operations */
|
||||||
void (*sv_shutdown)(struct svc_serv *serv,
|
|
||||||
struct net *net);
|
|
||||||
/* Callback to use when last thread
|
|
||||||
* exits.
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct module * sv_module; /* optional module to count when
|
struct module * sv_module; /* optional module to count when
|
||||||
* adding threads */
|
* adding threads */
|
||||||
svc_thread_fn sv_function; /* main function for threads */
|
svc_thread_fn sv_function; /* main function for threads */
|
||||||
|
@ -429,13 +430,12 @@ int svc_rpcb_setup(struct svc_serv *serv, struct net *net);
|
||||||
void svc_rpcb_cleanup(struct svc_serv *serv, struct net *net);
|
void svc_rpcb_cleanup(struct svc_serv *serv, struct net *net);
|
||||||
int svc_bind(struct svc_serv *serv, struct net *net);
|
int svc_bind(struct svc_serv *serv, struct net *net);
|
||||||
struct svc_serv *svc_create(struct svc_program *, unsigned int,
|
struct svc_serv *svc_create(struct svc_program *, unsigned int,
|
||||||
void (*shutdown)(struct svc_serv *, struct net *net));
|
struct svc_serv_ops *);
|
||||||
struct svc_rqst *svc_prepare_thread(struct svc_serv *serv,
|
struct svc_rqst *svc_prepare_thread(struct svc_serv *serv,
|
||||||
struct svc_pool *pool, int node);
|
struct svc_pool *pool, int node);
|
||||||
void svc_exit_thread(struct svc_rqst *);
|
void svc_exit_thread(struct svc_rqst *);
|
||||||
struct svc_serv * svc_create_pooled(struct svc_program *, unsigned int,
|
struct svc_serv * svc_create_pooled(struct svc_program *, unsigned int,
|
||||||
void (*shutdown)(struct svc_serv *, struct net *net),
|
struct svc_serv_ops *, svc_thread_fn, struct module *);
|
||||||
svc_thread_fn, struct module *);
|
|
||||||
int svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
|
int svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);
|
||||||
int svc_pool_stats_open(struct svc_serv *serv, struct file *file);
|
int svc_pool_stats_open(struct svc_serv *serv, struct file *file);
|
||||||
void svc_destroy(struct svc_serv *);
|
void svc_destroy(struct svc_serv *);
|
||||||
|
|
|
@ -423,7 +423,7 @@ EXPORT_SYMBOL_GPL(svc_bind);
|
||||||
*/
|
*/
|
||||||
static struct svc_serv *
|
static struct svc_serv *
|
||||||
__svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
|
__svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
|
||||||
void (*shutdown)(struct svc_serv *serv, struct net *net))
|
struct svc_serv_ops *ops)
|
||||||
{
|
{
|
||||||
struct svc_serv *serv;
|
struct svc_serv *serv;
|
||||||
unsigned int vers;
|
unsigned int vers;
|
||||||
|
@ -440,7 +440,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
|
||||||
bufsize = RPCSVC_MAXPAYLOAD;
|
bufsize = RPCSVC_MAXPAYLOAD;
|
||||||
serv->sv_max_payload = bufsize? bufsize : 4096;
|
serv->sv_max_payload = bufsize? bufsize : 4096;
|
||||||
serv->sv_max_mesg = roundup(serv->sv_max_payload + PAGE_SIZE, PAGE_SIZE);
|
serv->sv_max_mesg = roundup(serv->sv_max_payload + PAGE_SIZE, PAGE_SIZE);
|
||||||
serv->sv_shutdown = shutdown;
|
serv->sv_ops = ops;
|
||||||
xdrsize = 0;
|
xdrsize = 0;
|
||||||
while (prog) {
|
while (prog) {
|
||||||
prog->pg_lovers = prog->pg_nvers-1;
|
prog->pg_lovers = prog->pg_nvers-1;
|
||||||
|
@ -486,21 +486,21 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools,
|
||||||
|
|
||||||
struct svc_serv *
|
struct svc_serv *
|
||||||
svc_create(struct svc_program *prog, unsigned int bufsize,
|
svc_create(struct svc_program *prog, unsigned int bufsize,
|
||||||
void (*shutdown)(struct svc_serv *serv, struct net *net))
|
struct svc_serv_ops *ops)
|
||||||
{
|
{
|
||||||
return __svc_create(prog, bufsize, /*npools*/1, shutdown);
|
return __svc_create(prog, bufsize, /*npools*/1, ops);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(svc_create);
|
EXPORT_SYMBOL_GPL(svc_create);
|
||||||
|
|
||||||
struct svc_serv *
|
struct svc_serv *
|
||||||
svc_create_pooled(struct svc_program *prog, unsigned int bufsize,
|
svc_create_pooled(struct svc_program *prog, unsigned int bufsize,
|
||||||
void (*shutdown)(struct svc_serv *serv, struct net *net),
|
struct svc_serv_ops *ops, svc_thread_fn func,
|
||||||
svc_thread_fn func, struct module *mod)
|
struct module *mod)
|
||||||
{
|
{
|
||||||
struct svc_serv *serv;
|
struct svc_serv *serv;
|
||||||
unsigned int npools = svc_pool_map_get();
|
unsigned int npools = svc_pool_map_get();
|
||||||
|
|
||||||
serv = __svc_create(prog, bufsize, npools, shutdown);
|
serv = __svc_create(prog, bufsize, npools, ops);
|
||||||
if (!serv)
|
if (!serv)
|
||||||
goto out_err;
|
goto out_err;
|
||||||
|
|
||||||
|
@ -517,8 +517,8 @@ void svc_shutdown_net(struct svc_serv *serv, struct net *net)
|
||||||
{
|
{
|
||||||
svc_close_net(serv, net);
|
svc_close_net(serv, net);
|
||||||
|
|
||||||
if (serv->sv_shutdown)
|
if (serv->sv_ops->svo_shutdown)
|
||||||
serv->sv_shutdown(serv, net);
|
serv->sv_ops->svo_shutdown(serv, net);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(svc_shutdown_net);
|
EXPORT_SYMBOL_GPL(svc_shutdown_net);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue