From a4911ea2e51fdeff2a3aabf6b48a260cb8df167b Mon Sep 17 00:00:00 2001 From: shaver Date: Thu, 25 Sep 2003 04:53:28 +0000 Subject: [PATCH] b=1966: infinite INTERRUPTED SET CERROR loop when shutting down with Lustre. Until we figure out what we want to do in response to a signal sent to the osc_rpcd thread, just ignore signals. (Looping _inside_ l_wait_event doesn't clear the signals, so we need to do something other than this anyway.) --- lustre/osc/osc_rpcd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lustre/osc/osc_rpcd.c b/lustre/osc/osc_rpcd.c index 0d36ad6..c9b7691 100644 --- a/lustre/osc/osc_rpcd.c +++ b/lustre/osc/osc_rpcd.c @@ -156,10 +156,8 @@ static int osc_rpcd(void *arg) struct l_wait_info lwi; int timeout; - timeout = ptlrpc_set_next_timeout(orc->orc_set); - /* XXX the interrupted thing isn't really functional. */ - lwi = LWI_TIMEOUT_INTR(timeout * HZ, ptlrpc_expired_set, - ptlrpc_interrupted_set, orc->orc_set); + timeout = ptlrpc_set_next_timeout(orc->orc_set) * HZ; + lwi = LWI_TIMEOUT(timeout, ptlrpc_expired_set, orc->orc_set); /* ala the pinger, wait on orc's waitqueue and the set's */ init_waitqueue_entry(&set_wait, current); -- 1.8.3.1