--- src/sys/vfs/nfs/nfs_subs.c	2004/08/17 18:57:34	1.20
+++ src/sys/vfs/nfs/nfs_subs.c	2004/09/16 15:15:51	1.21
@@ -1069,6 +1069,7 @@ nfs_init(struct vfsconf *vfsp)
 {
 	int i;
 
+	callout_init(&nfs_timer_handle);
 	nfsmount_zone = zinit("NFSMOUNT", sizeof(struct nfsmount), 0, 0, 1);
 
 	nfs_mount_type = vfsp->vfc_typenum;
@@ -1142,8 +1143,7 @@ nfs_init(struct vfsconf *vfsp)
 int
 nfs_uninit(struct vfsconf *vfsp)
 {
-
-	untimeout(nfs_timer, (void *)NULL, nfs_timer_handle);
+	callout_stop(&nfs_timer_handle);
 	nfs_mount_type = -1;
 #ifndef NFS_NOSERVER
 	default_vnode_vops->vop_lease = nfs_prev_vop_lease_check;