mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
knfsd: remove special handling for SIGHUP
The special handling for SIGHUP in knfsd is a holdover from much earlier versions of Linux where reloading the export table was more expensive. That facility is not really needed anymore and to my knowledge, is seldom-used. Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
parent
3dd98a3bcc
commit
e096bbc648
1 changed files with 7 additions and 24 deletions
|
@ -44,11 +44,6 @@
|
|||
* when not handling a request. i.e. when waiting
|
||||
*/
|
||||
#define SHUTDOWN_SIGS (sigmask(SIGKILL) | sigmask(SIGHUP) | sigmask(SIGINT) | sigmask(SIGQUIT))
|
||||
/* if the last thread dies with SIGHUP, then the exports table is
|
||||
* left unchanged ( like 2.4-{0-9} ). Any other signal will clear
|
||||
* the exports table (like 2.2).
|
||||
*/
|
||||
#define SIG_NOCLEAN SIGHUP
|
||||
|
||||
extern struct svc_program nfsd_program;
|
||||
static void nfsd(struct svc_rqst *rqstp);
|
||||
|
@ -175,7 +170,6 @@ int nfsd_nrthreads(void)
|
|||
return nfsd_serv->sv_nrthreads;
|
||||
}
|
||||
|
||||
static int killsig; /* signal that was used to kill last nfsd */
|
||||
static void nfsd_last_thread(struct svc_serv *serv)
|
||||
{
|
||||
/* When last nfsd thread exits we need to do some clean-up */
|
||||
|
@ -186,11 +180,9 @@ static void nfsd_last_thread(struct svc_serv *serv)
|
|||
nfsd_racache_shutdown();
|
||||
nfs4_state_shutdown();
|
||||
|
||||
printk(KERN_WARNING "nfsd: last server has exited\n");
|
||||
if (killsig != SIG_NOCLEAN) {
|
||||
printk(KERN_WARNING "nfsd: unexporting all filesystems\n");
|
||||
nfsd_export_flush();
|
||||
}
|
||||
printk(KERN_WARNING "nfsd: last server has exited, flushing export "
|
||||
"cache\n");
|
||||
nfsd_export_flush();
|
||||
}
|
||||
|
||||
void nfsd_reset_versions(void)
|
||||
|
@ -242,10 +234,9 @@ int nfsd_create_serv(void)
|
|||
}
|
||||
|
||||
atomic_set(&nfsd_busy, 0);
|
||||
nfsd_serv = svc_create_pooled(&nfsd_program,
|
||||
nfsd_max_blksize,
|
||||
nfsd_last_thread,
|
||||
nfsd, SIG_NOCLEAN, THIS_MODULE);
|
||||
nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize,
|
||||
nfsd_last_thread, nfsd, SIGINT,
|
||||
THIS_MODULE);
|
||||
if (nfsd_serv == NULL)
|
||||
err = -ENOMEM;
|
||||
|
||||
|
@ -490,17 +481,9 @@ nfsd(struct svc_rqst *rqstp)
|
|||
atomic_dec(&nfsd_busy);
|
||||
}
|
||||
|
||||
if (err != -EINTR) {
|
||||
if (err != -EINTR)
|
||||
printk(KERN_WARNING "nfsd: terminating on error %d\n", -err);
|
||||
} else {
|
||||
unsigned int signo;
|
||||
|
||||
for (signo = 1; signo <= _NSIG; signo++)
|
||||
if (sigismember(¤t->pending.signal, signo) &&
|
||||
!sigismember(¤t->blocked, signo))
|
||||
break;
|
||||
killsig = signo;
|
||||
}
|
||||
/* Clear signals before calling svc_exit_thread() */
|
||||
flush_signals(current);
|
||||
|
||||
|
|
Loading…
Reference in a new issue