diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 1999-04-28 09:28:19 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 1999-04-28 09:28:19 +0000 |
| commit | b8c7f7d225a0818af863141be01804bafd685c8f (patch) | |
| tree | 80bf9d5ac5f1bc35b15507e8ef5b88e7a17c80ff /sys/miscfs | |
| parent | ae56ece12b92c7cacfd911b0acbdda5aaf9aa098 (diff) | |
zap the newhashinit hack.
Add an extra flag to hashinit telling if it should wait in malloc.
update all calls to hashinit.
Diffstat (limited to 'sys/miscfs')
| -rw-r--r-- | sys/miscfs/fdesc/fdesc_vnops.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/nullfs/null_subr.c | 4 | ||||
| -rw-r--r-- | sys/miscfs/umapfs/umap_subr.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c index 25e241c30e5..6c57364e670 100644 --- a/sys/miscfs/fdesc/fdesc_vnops.c +++ b/sys/miscfs/fdesc/fdesc_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fdesc_vnops.c,v 1.12 1998/08/06 19:34:32 csapuntz Exp $ */ +/* $OpenBSD: fdesc_vnops.c,v 1.13 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: fdesc_vnops.c,v 1.32 1996/04/11 11:24:29 mrg Exp $ */ /* @@ -199,7 +199,7 @@ fdesc_init(vfsp) if (cdevsw[cttymajor].d_open == cttyopen) break; devctty = makedev(cttymajor, 0); - fdhashtbl = hashinit(NFDCACHE, M_CACHE, &fdhash); + fdhashtbl = hashinit(NFDCACHE, M_CACHE, M_WAITOK, &fdhash); return (0); } diff --git a/sys/miscfs/nullfs/null_subr.c b/sys/miscfs/nullfs/null_subr.c index 5d4fadc09d8..ab4eda6fc95 100644 --- a/sys/miscfs/nullfs/null_subr.c +++ b/sys/miscfs/nullfs/null_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: null_subr.c,v 1.8 1998/08/06 19:34:41 csapuntz Exp $ */ +/* $OpenBSD: null_subr.c,v 1.9 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: null_subr.c,v 1.6 1996/05/10 22:50:52 jtk Exp $ */ /* @@ -84,7 +84,7 @@ nullfs_init(vfsp) #ifdef NULLFS_DIAGNOSTIC printf("nullfs_init\n"); /* printed during system boot */ #endif - null_node_hashtbl = hashinit(NNULLNODECACHE, M_CACHE, &null_node_hash); + null_node_hashtbl = hashinit(NNULLNODECACHE, M_CACHE, M_WAITOK, &null_node_hash); return (0); } diff --git a/sys/miscfs/umapfs/umap_subr.c b/sys/miscfs/umapfs/umap_subr.c index d3f8d9d801b..d88c78fa709 100644 --- a/sys/miscfs/umapfs/umap_subr.c +++ b/sys/miscfs/umapfs/umap_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umap_subr.c,v 1.11 1997/11/06 05:58:47 csapuntz Exp $ */ +/* $OpenBSD: umap_subr.c,v 1.12 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: umap_subr.c,v 1.8 1996/03/05 02:35:39 thorpej Exp $ */ /* @@ -83,7 +83,7 @@ umapfs_init(struct vfsconf *vfsp) #ifdef UMAPFS_DIAGNOSTIC printf("umapfs_init\n"); /* printed during system boot */ #endif - umap_node_hashtbl = hashinit(NUMAPNODECACHE, M_CACHE, &umap_node_hash); + umap_node_hashtbl = hashinit(NUMAPNODECACHE, M_CACHE, M_WAITOK, &umap_node_hash); return (0); } |