summaryrefslogtreecommitdiff
path: root/sys/nfs/nfs_socket.c
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2000-06-26 22:48:16 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2000-06-26 22:48:16 +0000
commitba8c9f5e49df22ca7994c1f22b5e4f50e5984cc9 (patch)
treed2f1c62cd91ae5ae0f06aa1939d2721be5dd76fb /sys/nfs/nfs_socket.c
parent116cce4edbd75135c1e24c5896f274e8fb7958e9 (diff)
Convert nfs_timer to new timeouts.
Diffstat (limited to 'sys/nfs/nfs_socket.c')
-rw-r--r--sys/nfs/nfs_socket.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c
index 197ccc61bdd..61325750224 100644
--- a/sys/nfs/nfs_socket.c
+++ b/sys/nfs/nfs_socket.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nfs_socket.c,v 1.16 2000/01/04 16:03:00 itojun Exp $ */
+/* $OpenBSD: nfs_socket.c,v 1.17 2000/06/26 22:48:14 art Exp $ */
/* $NetBSD: nfs_socket.c,v 1.27 1996/04/15 20:20:00 thorpej Exp $ */
/*
@@ -1248,16 +1248,17 @@ nfs_rephead(siz, nd, slp, err, cache, frev, mrq, mbp, bposp)
*/
void
nfs_timer(arg)
- void *arg; /* never used */
+ void *arg;
{
- register struct nfsreq *rep;
- register struct mbuf *m;
- register struct socket *so;
- register struct nfsmount *nmp;
- register int timeo;
+ struct timeout *to = (struct timeout *)arg;
+ struct nfsreq *rep;
+ struct mbuf *m;
+ struct socket *so;
+ struct nfsmount *nmp;
+ int timeo;
int s, error;
#ifdef NFSSERVER
- register struct nfssvc_sock *slp;
+ struct nfssvc_sock *slp;
static long lasttime = 0;
u_quad_t cur_usec;
#endif
@@ -1371,7 +1372,7 @@ nfs_timer(arg)
}
#endif /* NFSSERVER */
splx(s);
- timeout(nfs_timer, (void *)0, nfs_ticks);
+ timeout_add(to, nfs_ticks);
}
/*