diff options
| author |   tedu <tedu@openbsd.org> | 2010-07-03 03:04:55 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2010-07-03 03:04:55 +0000 |
| commit | c21a182b7e1e047eddfa58a31dd2d4cc04770ade (patch) | |
| tree | 5cc91404768413620f89c1a18f63dd3521e6ed9b /sys/kern/subr_pool.c | |
| parent | the sedtest regress test requires 200-ish file descriptors, so set a (diff) | |
| download | wireguard-openbsd-c21a182b7e1e047eddfa58a31dd2d4cc04770ade.tar.xz wireguard-openbsd-c21a182b7e1e047eddfa58a31dd2d4cc04770ade.zip | |
explicitly specify flags to malloc and pool_get instead of relying on 0.
This is more clear, and as thib pointed out, the default in softraid was
wrong. ok thib.
Diffstat (limited to 'sys/kern/subr_pool.c')
| -rw-r--r-- | sys/kern/subr_pool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c index cd856ea8e68..4516c2c1bc9 100644 --- a/sys/kern/subr_pool.c +++ b/sys/kern/subr_pool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_pool.c,v 1.95 2010/07/02 01:25:05 art Exp $ */ +/* $OpenBSD: subr_pool.c,v 1.96 2010/07/03 03:04:55 tedu Exp $ */ /* $NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $ */ /*- @@ -439,7 +439,8 @@ pool_alloc_item_header(struct pool *pp, caddr_t storage, int flags) if ((pp->pr_roflags & PR_PHINPAGE) != 0) ph = (struct pool_item_header *)(storage + pp->pr_phoffset); else - ph = pool_get(&phpool, flags & ~(PR_WAITOK | PR_ZERO)); + ph = pool_get(&phpool, (flags & ~(PR_WAITOK | PR_ZERO)) | + PR_NOWAIT); return (ph); } |