diff options
| author | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2009-09-02 18:20:55 +0000 |
|---|---|---|
| committer | Thordur I. Bjornsson <thib@cvs.openbsd.org> | 2009-09-02 18:20:55 +0000 |
| commit | 17a472fb8f7ec24b10b391b1db7dc7d2998bdec8 (patch) | |
| tree | 6f2cdeeac65b655ebe48a2373bb695b3a730fb84 /sys/nfs/nfsnode.h | |
| parent | 64dce1b62dbae5d0b90eb2fd54e23a0eeacbdf4d (diff) | |
Backout the asyncio/aiod change, as it causes buf's to get hung.
problem noticed by deraadt@
ok beck@
Diffstat (limited to 'sys/nfs/nfsnode.h')
| -rw-r--r-- | sys/nfs/nfsnode.h | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h index b0f00b77b73..85d411c9ba5 100644 --- a/sys/nfs/nfsnode.h +++ b/sys/nfs/nfsnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nfsnode.h,v 1.37 2009/08/27 23:26:56 thib Exp $ */ +/* $OpenBSD: nfsnode.h,v 1.38 2009/09/02 18:20:54 thib Exp $ */ /* $NetBSD: nfsnode.h,v 1.16 1996/02/18 11:54:04 fvdl Exp $ */ /* @@ -137,27 +137,10 @@ struct nfsnode { #define VTONFS(vp) ((struct nfsnode *)(vp)->v_data) #define NFSTOV(np) ((np)->n_vnode) -/* nfs aiod datas. */ -struct nfs_aiod { - LIST_ENTRY(nfs_aiod) nad_all; - LIST_ENTRY(nfs_aiod) nad_idle; - struct nfsmount *nad_mnt; - int nad_flags; -}; - -/* Flags for nad_flags. */ -#define NFSAIOD_EXIT 0x0001 /* aiod being asked to exit. */ -#define NFSAIOD_WAKEUP 0x0002 /* aiod being asked to wakeup. */ -/* used by nfs_set_naiod(), for convience. */ -#define NFSAIOD_QUIT (NFSAIOD_EXIT|NFSAIOD_WAKEUP) /* aiod must quit. */ - - -LIST_HEAD(nfs_aiodhead, nfs_aiod); - -extern struct mutex nfs_aiodl_mtx; -extern struct nfs_aiodhead nfs_aiods_all; -extern struct nfs_aiodhead nfs_aiods_idle; -extern int nfs_numaiods; -extern int nfs_aiodbufqmax; +/* + * Queue head for nfsiod's + */ +extern TAILQ_HEAD(nfs_bufqhead, buf) nfs_bufq; +extern uint32_t nfs_bufqlen, nfs_bufqmax; #endif /* _NFS_NFSNODE_H_ */ |