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/atm_cm.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/atm_cm.c')
| -rw-r--r-- | sys/netatm/atm_cm.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c index 733c045..8ca491f 100644 --- a/sys/netatm/atm_cm.c +++ b/sys/netatm/atm_cm.c @@ -168,8 +168,9 @@ atm_cm_connect(epp, token, ap, copp) /* * Get a connection block + * May be called from timeout - don't wait. */ - cop = uma_zalloc(atm_connection_zone, M_WAITOK); + cop = uma_zalloc(atm_connection_zone, M_NOWAIT); if (cop == NULL) return (ENOMEM); @@ -399,8 +400,9 @@ atm_cm_connect(epp, token, ap, copp) /* * Get a connection VCC block + * May be called from timeouts - don't wait. */ - cvp = uma_zalloc(atm_connvc_zone, M_WAITOK); + cvp = uma_zalloc(atm_connvc_zone, M_NOWAIT); if (cvp == NULL) { err = ENOMEM; goto donex; @@ -809,8 +811,9 @@ atm_cm_addllc(epp, token, llc, ecop, copp) /* * Get a connection block + * May be called from netisr - don't wait. */ - cop = uma_zalloc(atm_connection_zone, M_WAITOK); + cop = uma_zalloc(atm_connection_zone, M_NOWAIT); if (cop == NULL) return (ENOMEM); @@ -1260,8 +1263,9 @@ atm_cm_incoming(vcp, ap) /* * Get a connection VCC block + * May be called from netisr - don't wait. */ - cvp = uma_zalloc(atm_connvc_zone, M_WAITOK); + cvp = uma_zalloc(atm_connvc_zone, M_NOWAIT); if (cvp == NULL) { err = ENOMEM; goto fail; @@ -1578,8 +1582,9 @@ atm_cm_incall(cvp) if (cop == NULL) { /* * Need a new connection block + * May be called from timeout - dont wait. */ - cop = uma_zalloc(atm_connection_zone, M_WAITOK); + cop = uma_zalloc(atm_connection_zone, M_NOWAIT); if (cop == NULL) { cvp->cvc_attr.cause = atm_cause_tmpl; cvp->cvc_attr.cause.v.cause_value = |
