diff options
| author | harti <harti@FreeBSD.org> | 2003-07-23 14:28:57 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2003-07-23 14:28:57 +0000 |
| commit | f8b34e3f70219ed6642f2c3ed7430361969ccccf (patch) | |
| tree | 9fe86b328b35bc3515a752c557d6999aa602cfe7 /sys/netatm/uni/uniarp_vcm.c | |
| parent | 162e49f535eeecc1626f095ecec2e27292d2dd24 (diff) | |
| download | FreeBSD-src-f8b34e3f70219ed6642f2c3ed7430361969ccccf.zip FreeBSD-src-f8b34e3f70219ed6642f2c3ed7430361969ccccf.tar.gz | |
Convert a lot of uma_zalloc() calls to be NOWAIT instead of WAITOK. All
these may be called from contexts where we cannot sleep (callout handlers
for example).
Diffstat (limited to 'sys/netatm/uni/uniarp_vcm.c')
| -rw-r--r-- | sys/netatm/uni/uniarp_vcm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c index 0e09adb..3a2bc8a 100644 --- a/sys/netatm/uni/uniarp_vcm.c +++ b/sys/netatm/uni/uniarp_vcm.c @@ -272,8 +272,9 @@ uniarp_svcout(ivp, dst) /* * We're a client with an open VCC to the server, get a new arp entry + * May be called from timeout - don't wait. */ - uap = uma_zalloc(uniarp_zone, M_WAITOK); + uap = uma_zalloc(uniarp_zone, M_NOWAIT); if (uap == NULL) { (void) splx(s); return (MAP_FAILED); @@ -433,8 +434,9 @@ uniarp_svcin(ivp, dst, dstsub) /* * No info in the cache - get a new arp entry + * May be called from timeout - don't wait. */ - uap = uma_zalloc(uniarp_zone, M_WAITOK | M_ZERO); + uap = uma_zalloc(uniarp_zone, M_NOWAIT | M_ZERO); if (uap == NULL) { (void) splx(s); return (MAP_FAILED); |
