Backout the asyncio/aiod change, as it causes buf's to get hung.

problem noticed by deraadt@

ok beck@

1 files changed, 4 insertions, 6 deletions

diff --git a/sys/nfs/nfs_var.h b/sys/nfs/nfs_var.h
index adaf5e2772f..56fb97a615d 100644
--- a/sys/nfs/nfs_var.h
+++ b/sys/nfs/nfs_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_var.h,v 1.57 2009/08/20 15:04:24 thib Exp $	*/
+/*	$OpenBSD: nfs_var.h,v 1.58 2009/09/02 18:20:54 thib Exp $	*/
 /*	$NetBSD: nfs_var.h,v 1.3 1996/02/18 11:53:54 fvdl Exp $	*/
 
 /*
@@ -44,11 +44,6 @@ struct componentname;
 struct nfs_diskless;
 struct nfsm_info;
 
-/* nfs_aiod.c */
-void	nfs_aiod(void *);
-int	nfs_set_naiod(int);
-void	nfs_init_aiod(void);
-
 /* nfs_bio.c */
 int nfs_bioread(struct vnode *, struct uio *, int, struct ucred *);
 int nfs_write(void *);
@@ -261,6 +256,9 @@ int nfssvc_nfsd(struct nfsd *);
 void nfsrv_zapsock(struct nfssvc_sock *);
 void nfsrv_slpderef(struct nfssvc_sock *);
 void nfsrv_init(int);
+void nfssvc_iod(void *);
+void start_nfsio(void *);
+void nfs_getset_niothreads(int);
 
 /* nfs_kq.c */
 int  nfs_kqfilter(void *);