Commit f0943238 authored by Josef Bacik's avatar Josef Bacik Committed by Chuck Lever
Browse files

sunrpc: pass in the sv_stats struct through svc_create_pooled 



Since only one service actually reports the rpc stats there's not much
of a reason to have a pointer to it in the svc_program struct.  Adjust
the svc_create_pooled function to take the sv_stats as an argument and
pass the struct through there as desired instead of getting it from the
svc_program->pg_stats.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent a2214ed5

fs/nfsd/nfssvc.c

+2 −1
Original line number Diff line number Diff line
@@ -661,7 +661,8 @@ int nfsd_create_serv(struct net *net) 
	if (nfsd_max_blksize == 0)

		nfsd_max_blksize = nfsd_get_default_max_blksize();

	nfsd_reset_versions(nn);

	serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize, nfsd);

	serv = svc_create_pooled(&nfsd_program, &nfsd_svcstats,

				 nfsd_max_blksize, nfsd);

	if (serv == NULL)

		return -ENOMEM;

include/linux/sunrpc/svc.h

+3 −1
Original line number Diff line number Diff line
@@ -411,7 +411,9 @@ bool svc_rqst_replace_page(struct svc_rqst *rqstp, 
void		   svc_rqst_release_pages(struct svc_rqst *rqstp);

void		   svc_rqst_free(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 *prog,

				     struct svc_stat *stats,

				     unsigned int bufsize,

				     int (*threadfn)(void *data));

int		   svc_set_num_threads(struct svc_serv *, struct svc_pool *, int);

int		   svc_pool_stats_open(struct svc_info *si, struct file *file);

net/sunrpc/svc.c

+7 −5
Original line number Diff line number Diff line
@@ -451,8 +451,8 @@ __svc_init_bc(struct svc_serv *serv) 
 * Create an RPC service

 */

static struct svc_serv *

__svc_create(struct svc_program *prog, unsigned int bufsize, int npools,

	     int (*threadfn)(void *data))

__svc_create(struct svc_program *prog, struct svc_stat *stats,

	     unsigned int bufsize, int npools, int (*threadfn)(void *data))

{

	struct svc_serv	*serv;

	unsigned int vers;
@@ -463,7 +463,7 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, 
		return NULL;

	serv->sv_name      = prog->pg_name;

	serv->sv_program   = prog;

	serv->sv_stats     = prog->pg_stats;

	serv->sv_stats     = stats;

	if (bufsize > RPCSVC_MAXPAYLOAD)

		bufsize = RPCSVC_MAXPAYLOAD;

	serv->sv_max_payload = bufsize? bufsize : 4096;
@@ -529,26 +529,28 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, 
struct svc_serv *svc_create(struct svc_program *prog, unsigned int bufsize,

			    int (*threadfn)(void *data))

{

	return __svc_create(prog, bufsize, 1, threadfn);

	return __svc_create(prog, NULL, bufsize, 1, threadfn);

}

EXPORT_SYMBOL_GPL(svc_create);



/**

 * svc_create_pooled - Create an RPC service with pooled threads

 * @prog: the RPC program the new service will handle

 * @stats: the stats struct if desired

 * @bufsize: maximum message size for @prog

 * @threadfn: a function to service RPC requests for @prog

 *

 * Returns an instantiated struct svc_serv object or NULL.

 */

struct svc_serv *svc_create_pooled(struct svc_program *prog,

				   struct svc_stat *stats,

				   unsigned int bufsize,

				   int (*threadfn)(void *data))

{

	struct svc_serv *serv;

	unsigned int npools = svc_pool_map_get();



	serv = __svc_create(prog, bufsize, npools, threadfn);

	serv = __svc_create(prog, stats, bufsize, npools, threadfn);

	if (!serv)

		goto out_err;

	return serv;