From e1249375c2f1d746952505f16f2656129bcb5765 Mon Sep 17 00:00:00 2001 From: "Thordur I. Bjornsson" Date: Tue, 25 Aug 2009 13:41:30 +0000 Subject: move to having requests on a per nfsmount tailq instead of one global one. also make the rexmit timeout per nfsmount, and make sure to start/stop the timer appropriately. now the nfs_timer() only fires if there is work todo, not always at nfs_ticks (it did, even if there where no nfsmounts in the system!). OK blambert@ --- sys/nfs/nfs_subs.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'sys/nfs/nfs_subs.c') diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index bc845e93895..a55ec8b6158 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.104 2009/08/20 15:04:24 thib Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.105 2009/08/25 13:41:29 thib Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -895,8 +895,6 @@ nfs_adv(mdp, dposp, offs, left) void nfs_init() { - static struct timeout nfs_timer_to; - rpc_vers = txdr_unsigned(RPC_VER2); rpc_call = txdr_unsigned(RPC_CALL); rpc_reply = txdr_unsigned(RPC_REPLY); @@ -919,14 +917,6 @@ nfs_init() pool_init(&nfsreqpl, sizeof(struct nfsreq), 0, 0, 0, "nfsreqpl", &pool_allocator_nointr); - - /* - * Initialize reply list and start timer - */ - TAILQ_INIT(&nfs_reqq); - - timeout_set(&nfs_timer_to, nfs_timer, &nfs_timer_to); - nfs_timer(&nfs_timer_to); } #ifdef NFSCLIENT -- cgit v1.2.3