diff options
author | Jeff Layton <jlayton@redhat.com> | 2008-06-10 08:40:39 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-06-23 13:02:49 -0400 |
commit | a75c5d01e4235a7dd785548ac756f248b1b40107 (patch) | |
tree | 602c517b868a219d184e42d23cda4e834396c8ca /net | |
parent | 9867d76ca16b3f455f9ca83861f4ce5c94a25928 (diff) |
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: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/svc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 03a9f1a9e75c..5a32cb7c4bb4 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
@@ -434,7 +434,7 @@ EXPORT_SYMBOL(svc_create); | |||
434 | struct svc_serv * | 434 | struct svc_serv * |
435 | svc_create_pooled(struct svc_program *prog, unsigned int bufsize, | 435 | svc_create_pooled(struct svc_program *prog, unsigned int bufsize, |
436 | void (*shutdown)(struct svc_serv *serv), | 436 | void (*shutdown)(struct svc_serv *serv), |
437 | svc_thread_fn func, int sig, struct module *mod) | 437 | svc_thread_fn func, struct module *mod) |
438 | { | 438 | { |
439 | struct svc_serv *serv; | 439 | struct svc_serv *serv; |
440 | unsigned int npools = svc_pool_map_get(); | 440 | unsigned int npools = svc_pool_map_get(); |
@@ -443,7 +443,6 @@ svc_create_pooled(struct svc_program *prog, unsigned int bufsize, | |||
443 | 443 | ||
444 | if (serv != NULL) { | 444 | if (serv != NULL) { |
445 | serv->sv_function = func; | 445 | serv->sv_function = func; |
446 | serv->sv_kill_signal = sig; | ||
447 | serv->sv_module = mod; | 446 | serv->sv_module = mod; |
448 | } | 447 | } |
449 | 448 | ||
@@ -683,7 +682,7 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs) | |||
683 | /* destroy old threads */ | 682 | /* destroy old threads */ |
684 | while (nrservs < 0 && | 683 | while (nrservs < 0 && |
685 | (task = choose_victim(serv, pool, &state)) != NULL) { | 684 | (task = choose_victim(serv, pool, &state)) != NULL) { |
686 | send_sig(serv->sv_kill_signal, task, 1); | 685 | send_sig(SIGINT, task, 1); |
687 | nrservs++; | 686 | nrservs++; |
688 | } | 687 | } |
689 | 688 | ||