diff options
| author |   art <art@openbsd.org> | 1999-04-28 09:28:14 +0000 |
|---|---|---|
| committer | art <art@openbsd.org> | 1999-04-28 09:28:14 +0000 |
| commit | a197ef3200bd75939df756dd231d991195efe33a (patch) | |
| tree | 8abb82e98574d5b895e1f487af9fff1308c2c156 /sys/nfs | |
| parent | Merge with EOM 1.5 (diff) | |
| download | wireguard-openbsd-a197ef3200bd75939df756dd231d991195efe33a.tar.xz wireguard-openbsd-a197ef3200bd75939df756dd231d991195efe33a.zip | |
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/nfs')
| -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 |
3 files changed, 6 insertions, 6 deletions
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); } /* |