From 186c0bc04b8528af8dd4884021c6f06465a80e4b Mon Sep 17 00:00:00 2001 From: Alexander Kabaev Date: Sun, 28 Mar 2004 05:55:27 +0000 Subject: [PATCH] Reset callout if in nfs_timeout and rpcclnt_timeout functions. Timer are supposed to continue firing as long as there is work to do, not stop after the first invocation. This is damage control after a patch that has been committed prematurely. Tested by: kris --- sys/nfsclient/nfs_socket.c | 1 + sys/rpc/rpcclnt.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 697478c71578..0440c7bccac3 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -1188,6 +1188,7 @@ nfs_timer(void *arg) } } splx(s); + callout_reset(&nfs_callout, nfs_ticks, nfs_timer, NULL); } /* diff --git a/sys/rpc/rpcclnt.c b/sys/rpc/rpcclnt.c index 49ffea0cbe0c..5b570c2a40e3 100644 --- a/sys/rpc/rpcclnt.c +++ b/sys/rpc/rpcclnt.c @@ -1478,6 +1478,8 @@ rpcclnt_timer(arg) #ifdef __OpenBSD__ timeout_add(rpcclnt_timer, to, rpcclnt_ticks); +#else + callout_reset(&rpcclnt_callout, rpcclnt_ticks, rpcclnt_timer, NULL); #endif }