Commit 7f221b34 authored by Jeff Layton's avatar Jeff Layton Committed by Chuck Lever
Browse files

sunrpc: split new thread creation into a separate function 



Break out the part of svc_start_kthreads() that creates a thread into
svc_new_thread(), as a new exported helper function.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 7ffc7ade

include/linux/sunrpc/svc.h

+1 −0
Original line number Diff line number Diff line
@@ -442,6 +442,7 @@ struct svc_serv *svc_create(struct svc_program *, unsigned int, 
bool		   svc_rqst_replace_page(struct svc_rqst *rqstp,

					 struct page *page);

void		   svc_rqst_release_pages(struct svc_rqst *rqstp);

int		   svc_new_thread(struct svc_serv *serv, struct svc_pool *pool);

void		   svc_exit_thread(struct svc_rqst *);

struct svc_serv *  svc_create_pooled(struct svc_program *prog,

				     unsigned int nprog,

net/sunrpc/svc.c

+46 −29
Original line number Diff line number Diff line
@@ -763,16 +763,23 @@ void svc_pool_wake_idle_thread(struct svc_pool *pool) 
}

EXPORT_SYMBOL_GPL(svc_pool_wake_idle_thread);



static int

svc_start_kthreads(struct svc_serv *serv, struct svc_pool *pool, int nrservs)

/**

 * svc_new_thread - spawn a new thread in the given pool

 * @serv: the serv to which the pool belongs

 * @pool: pool in which thread should be spawned

 *

 * Create a new thread inside @pool, which is a part of @serv.

 * Caller must hold the service mutex.

 *

 * Returns 0 on success, or -errno on failure.

 */

int svc_new_thread(struct svc_serv *serv, struct svc_pool *pool)

{

	struct svc_rqst	*rqstp;

	struct task_struct *task;

	int node;

	int err;

	int err = 0;



	do {

		nrservs--;

	node = svc_pool_map_get_node(pool->sp_id);



	rqstp = svc_prepare_thread(serv, pool, node);
@@ -781,8 +788,8 @@ svc_start_kthreads(struct svc_serv *serv, struct svc_pool *pool, int nrservs) 
	task = kthread_create_on_node(serv->sv_threadfn, rqstp,

				      node, "%s", serv->sv_name);

	if (IS_ERR(task)) {

			svc_exit_thread(rqstp);

			return PTR_ERR(task);

		err = PTR_ERR(task);

		goto out;

	}



	rqstp->rq_task = task;
@@ -792,15 +799,25 @@ svc_start_kthreads(struct svc_serv *serv, struct svc_pool *pool, int nrservs) 
	svc_sock_update_bufs(serv);

	wake_up_process(task);



	/* Wait for the thread to signal initialization status */

	wait_var_event(&rqstp->rq_err, rqstp->rq_err != -EAGAIN);

	err = rqstp->rq_err;

		if (err) {

out:

	if (err)

		svc_exit_thread(rqstp);

	return err;

}

	} while (nrservs > 0);

EXPORT_SYMBOL_GPL(svc_new_thread);



	return 0;

static int

svc_start_kthreads(struct svc_serv *serv, struct svc_pool *pool, int nrservs)

{

	int err = 0;



	while (!err && nrservs--)

		err = svc_new_thread(serv, pool);



	return err;

}



static int