diff options
-rw-r--r-- | sys/isofs/cd9660/cd9660_node.c | 6 | ||||
-rw-r--r-- | sys/kern/kern_proc.c | 8 | ||||
-rw-r--r-- | sys/kern/kern_subr.c | 12 | ||||
-rw-r--r-- | sys/kern/vfs_bio.c | 4 | ||||
-rw-r--r-- | sys/kern/vfs_cache.c | 4 | ||||
-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 | ||||
-rw-r--r-- | sys/msdosfs/msdosfs_denode.c | 4 | ||||
-rw-r--r-- | sys/netinet/in_pcb.c | 4 | ||||
-rw-r--r-- | sys/netinet/ip_mroute.c | 4 | ||||
-rw-r--r-- | sys/netinet6/raw_ipv6.c | 6 | ||||
-rw-r--r-- | sys/netipx/ipx_pcb.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_node.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_srvcache.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_subs.c | 4 | ||||
-rw-r--r-- | sys/sys/systm.h | 5 | ||||
-rw-r--r-- | sys/ufs/ffs/ffs_softdep.c | 7 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_ihash.c | 4 | ||||
-rw-r--r-- | sys/ufs/ufs/ufs_quota.c | 4 | ||||
-rw-r--r-- | sys/uvm/uvm_aobj.c | 4 |
21 files changed, 48 insertions, 56 deletions
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c index 050a4f417c3..38b0e794a45 100644 --- a/sys/isofs/cd9660/cd9660_node.c +++ b/sys/isofs/cd9660/cd9660_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd9660_node.c,v 1.9 1998/08/21 23:31:32 csapuntz Exp $ */ +/* $OpenBSD: cd9660_node.c,v 1.10 1999/04/28 09:28:14 art Exp $ */ /* $NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $ */ /*- @@ -84,10 +84,10 @@ cd9660_init(vfsp) struct vfsconf *vfsp; { - isohashtbl = hashinit(desiredvnodes, M_ISOFSMNT, &isohash); + isohashtbl = hashinit(desiredvnodes, M_ISOFSMNT, M_WAITOK, &isohash); simple_lock_init(&cd9660_ihash_slock); #ifdef ISODEVMAP - idvhashtbl = hashinit(desiredvnodes / 8, M_ISOFSMNT, &idvhash); + idvhashtbl = hashinit(desiredvnodes / 8, M_ISOFSMNT, M_WAITOK, &idvhash); #endif return (0); } diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index c9f4630665e..d431cc3315b 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_proc.c,v 1.5 1998/03/02 07:19:11 todd Exp $ */ +/* $OpenBSD: kern_proc.c,v 1.6 1999/04/28 09:28:14 art Exp $ */ /* $NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $ */ /* @@ -89,9 +89,9 @@ procinit() LIST_INIT(&allproc); LIST_INIT(&zombproc); - pidhashtbl = hashinit(maxproc / 4, M_PROC, &pidhash); - pgrphashtbl = hashinit(maxproc / 4, M_PROC, &pgrphash); - uihashtbl = hashinit(maxproc / 16, M_PROC, &uihash); + pidhashtbl = hashinit(maxproc / 4, M_PROC, M_WAITOK, &pidhash); + pgrphashtbl = hashinit(maxproc / 4, M_PROC, M_WAITOK, &pgrphash); + uihashtbl = hashinit(maxproc / 16, M_PROC, M_WAITOK, &uihash); } /* diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c index 6e9edbb950a..be226f857e8 100644 --- a/sys/kern/kern_subr.c +++ b/sys/kern/kern_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_subr.c,v 1.8 1999/02/26 04:56:02 art Exp $ */ +/* $OpenBSD: kern_subr.c,v 1.9 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $ */ /* @@ -161,15 +161,7 @@ again: * General routine to allocate a hash table. */ void * -hashinit(elements, type, hashmask) - int elements, type; - u_long *hashmask; -{ - return newhashinit(elements, type, M_WAITOK, hashmask); -} - -void * -newhashinit(elements, type, flags, hashmask) +hashinit(elements, type, flags, hashmask) int elements, type, flags; u_long *hashmask; { diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index e3dc675b9d9..4f9cf928510 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_bio.c,v 1.21 1998/11/29 01:46:58 art Exp $ */ +/* $OpenBSD: vfs_bio.c,v 1.22 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $ */ /*- @@ -144,7 +144,7 @@ bufinit() for (dp = bufqueues; dp < &bufqueues[BQUEUES]; dp++) TAILQ_INIT(dp); - bufhashtbl = hashinit(nbuf, M_CACHE, &bufhash); + bufhashtbl = hashinit(nbuf, M_CACHE, M_WAITOK, &bufhash); base = bufpages / nbuf; residual = bufpages % nbuf; for (i = 0; i < nbuf; i++) { diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 6a626ca7aa3..34a983afb61 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_cache.c,v 1.2 1996/03/03 17:20:23 niklas Exp $ */ +/* $OpenBSD: vfs_cache.c,v 1.3 1999/04/28 09:28:15 art Exp $ */ /* $NetBSD: vfs_cache.c,v 1.13 1996/02/04 02:18:09 christos Exp $ */ /* @@ -227,7 +227,7 @@ nchinit() { TAILQ_INIT(&nclruhead); - nchashtbl = hashinit(desiredvnodes, M_CACHE, &nchash); + nchashtbl = hashinit(desiredvnodes, M_CACHE, M_WAITOK, &nchash); } /* 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); } diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c index 0bc5c0a3a6c..036770e8f8f 100644 --- a/sys/msdosfs/msdosfs_denode.c +++ b/sys/msdosfs/msdosfs_denode.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_denode.c,v 1.15 1999/02/26 03:28:13 art Exp $ */ +/* $OpenBSD: msdosfs_denode.c,v 1.16 1999/04/28 09:28:16 art Exp $ */ /* $NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $ */ /*- @@ -81,7 +81,7 @@ int msdosfs_init(vfsp) struct vfsconf *vfsp; { - dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, &dehash); + dehashtbl = hashinit(desiredvnodes/2, M_MSDOSFSMNT, M_WAITOK, &dehash); return (0); } diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 66fc00db939..60b95862e0e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.32 1999/03/27 21:04:18 provos Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.33 1999/04/28 09:28:16 art Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -113,7 +113,7 @@ in_pcbinit(table, hashsize) { CIRCLEQ_INIT(&table->inpt_queue); - table->inpt_hashtbl = hashinit(hashsize, M_PCB, &table->inpt_hash); + table->inpt_hashtbl = hashinit(hashsize, M_PCB, M_WAITOK, &table->inpt_hash); table->inpt_lastport = 0; } diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index b76fe4e562c..b59d162d43c 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_mroute.c,v 1.15 1999/04/20 20:06:12 niklas Exp $ */ +/* $OpenBSD: ip_mroute.c,v 1.16 1999/04/28 09:28:16 art Exp $ */ /* $NetBSD: ip_mroute.c,v 1.27 1996/05/07 02:40:50 thorpej Exp $ */ /* @@ -408,7 +408,7 @@ ip_mrouter_init(so, m) ip_mrouter = so; - mfchashtbl = hashinit(MFCTBLSIZ, M_MRTABLE, &mfchash); + mfchashtbl = hashinit(MFCTBLSIZ, M_MRTABLE, M_WAITOK, &mfchash); bzero((caddr_t)nexpire, sizeof(nexpire)); pim_assert = 0; diff --git a/sys/netinet6/raw_ipv6.c b/sys/netinet6/raw_ipv6.c index e6ed96e4428..72f995404a4 100644 --- a/sys/netinet6/raw_ipv6.c +++ b/sys/netinet6/raw_ipv6.c @@ -42,7 +42,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. * SUCH DAMAGE. * * @(#)raw_ip.c 8.7 (Berkeley) 5/15/95 - * $Id: raw_ipv6.c,v 1.3 1999/03/09 05:31:55 cmetz Exp $ + * $Id: raw_ipv6.c,v 1.4 1999/04/28 09:28:16 art Exp $ */ #include <sys/param.h> @@ -155,8 +155,8 @@ ripv6_init() * to allocate a one entry hash list than it is to check all * over the place for hashbase == NULL. */ - ri6pcbinfo.hashbase = hashinit(1, M_PCB, &ri6pcbinfo.hashmask); - ri6pcbinfo.porthashbase = hashinit(1, M_PCB, &ri6pcbinfo.porthashmask); + ri6pcbinfo.hashbase = hashinit(1, M_PCB, M_WAITOK, &ri6pcbinfo.hashmask); + ri6pcbinfo.porthashbase = hashinit(1, M_PCB, M_WAITOK, &ri6pcbinfo.porthashmask); ri6pcbinfo.ipi_zone = zinit("ri6pcb", sizeof(struct inpcb), nmbclusters / 4, ZONE_INTERRUPT, 0); #else /* __FreeBSD__ */ diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c index b681fba81cc..0b55f91fa28 100644 --- a/sys/netipx/ipx_pcb.c +++ b/sys/netipx/ipx_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipx_pcb.c,v 1.2 1996/10/26 09:34:53 mickey Exp $ */ +/* $OpenBSD: ipx_pcb.c,v 1.3 1999/04/28 09:28:16 art Exp $ */ /*- * @@ -68,7 +68,7 @@ ipx_pcbinit(table, hashsize) int hashsize; { CIRCLEQ_INIT(&table->ipxpt_queue); - table->ipxpt_hashtbl = hashinit(hashsize, M_PCB, &table->ipxpt_hash); + table->ipxpt_hashtbl = hashinit(hashsize, M_PCB, M_WAITOK, &table->ipxpt_hash); table->ipxpt_lport = 0; } diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c index 821450837c2..7d4954e1f83 100644 --- a/sys/nfs/nfs_node.c +++ b/sys/nfs/nfs_node.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_node.c,v 1.12 1998/08/21 23:16:39 csapuntz Exp $ */ +/* $OpenBSD: nfs_node.c,v 1.13 1999/04/28 09:28:17 art Exp $ */ /* $NetBSD: nfs_node.c,v 1.16 1996/02/18 11:53:42 fvdl Exp $ */ /* @@ -71,7 +71,7 @@ void nfs_nhinit() { - nfsnodehashtbl = hashinit(desiredvnodes, M_NFSNODE, &nfsnodehash); + nfsnodehashtbl = hashinit(desiredvnodes, M_NFSNODE, M_WAITOK, &nfsnodehash); } /* diff --git a/sys/nfs/nfs_srvcache.c b/sys/nfs/nfs_srvcache.c index fb6004cdfe2..a167ae4f300 100644 --- a/sys/nfs/nfs_srvcache.c +++ b/sys/nfs/nfs_srvcache.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_srvcache.c,v 1.5 1996/04/21 22:30:28 deraadt Exp $ */ +/* $OpenBSD: nfs_srvcache.c,v 1.6 1999/04/28 09:28:17 art Exp $ */ /* $NetBSD: nfs_srvcache.c,v 1.12 1996/02/18 11:53:49 fvdl Exp $ */ /* @@ -144,7 +144,7 @@ void nfsrv_initcache() { - nfsrvhashtbl = hashinit(desirednfsrvcache, M_NFSD, &nfsrvhash); + nfsrvhashtbl = hashinit(desirednfsrvcache, M_NFSD, M_WAITOK, &nfsrvhash); TAILQ_INIT(&nfsrvlruhead); } diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index e6b5c773eca..f4c6a736892 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_subs.c,v 1.26 1999/02/26 03:16:25 art Exp $ */ +/* $OpenBSD: nfs_subs.c,v 1.27 1999/04/28 09:28:17 art Exp $ */ /* $NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $ */ /* @@ -1133,7 +1133,7 @@ nfs_init() + nqsrv_clockskew + nqsrv_writeslack; NQLOADNOVRAM(nqnfsstarttime); CIRCLEQ_INIT(&nqtimerhead); - nqfhhashtbl = hashinit(NQLCHSZ, M_NQLEASE, &nqfhhash); + nqfhhashtbl = hashinit(NQLCHSZ, M_NQLEASE, M_WAITOK, &nqfhhash); } /* diff --git a/sys/sys/systm.h b/sys/sys/systm.h index a67597ae474..69ba067c651 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: systm.h,v 1.27 1999/02/26 03:19:57 art Exp $ */ +/* $OpenBSD: systm.h,v 1.28 1999/04/28 09:28:17 art Exp $ */ /* $NetBSD: systm.h,v 1.50 1996/06/09 04:55:09 briggs Exp $ */ /*- @@ -141,8 +141,7 @@ void vfs_opv_init_default __P((struct vnodeopv_desc *)); void vfs_op_init __P((void)); int seltrue __P((dev_t dev, int which, struct proc *)); -void *hashinit __P((int, int, u_long *)); -void *newhashinit __P((int, int, int, u_long *)); +void *hashinit __P((int, int, int, u_long *)); int sys_nosys __P((struct proc *, void *, register_t *)); void panic __P((const char *, ...)) diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c index b286321fc53..8162bc3ddf9 100644 --- a/sys/ufs/ffs/ffs_softdep.c +++ b/sys/ufs/ffs/ffs_softdep.c @@ -890,12 +890,13 @@ softdep_initialize() LIST_INIT(&mkdirlisthd); LIST_INIT(&softdep_workitem_pending); max_softdeps = desiredvnodes * (32 / sizeof(register_t)); - pagedep_hashtbl = hashinit(desiredvnodes / 5, M_PAGEDEP, + pagedep_hashtbl = hashinit(desiredvnodes / 5, M_PAGEDEP, M_WAITOK, &pagedep_hash); sema_init(&pagedep_in_progress, "pagedep", PRIBIO, 0); - inodedep_hashtbl = hashinit(desiredvnodes, M_INODEDEP, &inodedep_hash); + inodedep_hashtbl = hashinit(desiredvnodes, M_INODEDEP, M_WAITOK, + &inodedep_hash); sema_init(&inodedep_in_progress, "inodedep", PRIBIO, 0); - newblk_hashtbl = hashinit(64, M_NEWBLK, &newblk_hash); + newblk_hashtbl = hashinit(64, M_NEWBLK, M_WAITOK, &newblk_hash); sema_init(&newblk_in_progress, "newblk", PRIBIO, 0); } diff --git a/sys/ufs/ufs/ufs_ihash.c b/sys/ufs/ufs/ufs_ihash.c index 73abce20529..29239bc6e67 100644 --- a/sys/ufs/ufs/ufs_ihash.c +++ b/sys/ufs/ufs/ufs_ihash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_ihash.c,v 1.6 1998/01/09 20:38:05 csapuntz Exp $ */ +/* $OpenBSD: ufs_ihash.c,v 1.7 1999/04/28 09:28:18 art Exp $ */ /* $NetBSD: ufs_ihash.c,v 1.3 1996/02/09 22:36:04 christos Exp $ */ /* @@ -61,7 +61,7 @@ void ufs_ihashinit() { - ihashtbl = hashinit(desiredvnodes, M_UFSMNT, &ihash); + ihashtbl = hashinit(desiredvnodes, M_UFSMNT, M_WAITOK, &ihash); simple_lock_init(&ufs_ihash_slock); } diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 667491eea28..affc8bbfde5 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_quota.c,v 1.6 1997/11/06 05:59:28 csapuntz Exp $ */ +/* $OpenBSD: ufs_quota.c,v 1.7 1999/04/28 09:28:18 art Exp $ */ /* $NetBSD: ufs_quota.c,v 1.8 1996/02/09 22:36:09 christos Exp $ */ /* @@ -688,7 +688,7 @@ void dqinit() { - dqhashtbl = hashinit(desiredvnodes, M_DQUOT, &dqhash); + dqhashtbl = hashinit(desiredvnodes, M_DQUOT, M_WAITOK, &dqhash); TAILQ_INIT(&dqfreelist); } diff --git a/sys/uvm/uvm_aobj.c b/sys/uvm/uvm_aobj.c index 9c69fc0d4e7..a0a50c7f72c 100644 --- a/sys/uvm/uvm_aobj.c +++ b/sys/uvm/uvm_aobj.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_aobj.c,v 1.2 1999/02/26 05:32:06 art Exp $ */ +/* $OpenBSD: uvm_aobj.c,v 1.3 1999/04/28 09:28:18 art Exp $ */ /* $NetBSD: uvm_aobj.c,v 1.15 1998/10/18 23:49:59 chs Exp $ */ /* @@ -522,7 +522,7 @@ uao_create(size, flags) /* allocate hash table or array depending on object size */ if (UAO_USES_SWHASH(aobj)) { - aobj->u_swhash = newhashinit(UAO_SWHASH_BUCKETS(aobj), + aobj->u_swhash = hashinit(UAO_SWHASH_BUCKETS(aobj), M_UVMAOBJ, mflags, &aobj->u_swhashmask); if (aobj->u_swhash == NULL) panic("uao_create: hashinit swhash failed"); |