Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a75c5d01 authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

sunrpc: remove sv_kill_signal field from svc_serv struct 



Since we no longer make any distinction between shutdown signals with
nfsd, then it becomes easier to just standardize on a particular signal
to use to bring it down (SIGINT, in this case).

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 9867d76c

fs/nfsd/nfssvc.c

+1 −2
Original line number Diff line number Diff line
@@ -236,8 +236,7 @@ int nfsd_create_serv(void) 


	atomic_set(&nfsd_busy, 0);

	nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,

				      nfsd_last_thread, nfsd, SIGINT,

				      THIS_MODULE);

				      nfsd_last_thread, nfsd, THIS_MODULE);

	if (nfsd_serv == NULL)

		err = -ENOMEM;

include/linux/sunrpc/svc.h

+2 −3
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ struct svc_serv { 
	struct module *		sv_module;	/* optional module to count when

						 * adding threads */

	svc_thread_fn		sv_function;	/* main function for threads */

	int			sv_kill_signal;	/* signal to kill threads */

};



/*
@@ -388,8 +387,8 @@ struct svc_rqst *svc_prepare_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 *, unsigned int,

			void (*shutdown)(struct svc_serv*),

			svc_thread_fn, int sig, struct module *);

			void (*shutdown)(struct svc_serv*), svc_thread_fn,

			struct module *);

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

void		   svc_destroy(struct svc_serv *);

int		   svc_process(struct svc_rqst *);

net/sunrpc/svc.c

+2 −3
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ EXPORT_SYMBOL(svc_create); 
struct svc_serv *

svc_create_pooled(struct svc_program *prog, unsigned int bufsize,

		void (*shutdown)(struct svc_serv *serv),

		  svc_thread_fn func, int sig, struct module *mod)

		  svc_thread_fn func, struct module *mod)

{

	struct svc_serv *serv;

	unsigned int npools = svc_pool_map_get();
@@ -443,7 +443,6 @@ svc_create_pooled(struct svc_program *prog, unsigned int bufsize, 


	if (serv != NULL) {

		serv->sv_function = func;

		serv->sv_kill_signal = sig;

		serv->sv_module = mod;

	}
@@ -683,7 +682,7 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs) 
	/* destroy old threads */

	while (nrservs < 0 &&

	       (task = choose_victim(serv, pool, &state)) != NULL) {

		send_sig(serv->sv_kill_signal, task, 1);

		send_sig(SIGINT, task, 1);

		nrservs++;

	}