diff options
| author | harti <harti@FreeBSD.org> | 2003-07-18 16:36:41 +0000 |
|---|---|---|
| committer | harti <harti@FreeBSD.org> | 2003-07-18 16:36:41 +0000 |
| commit | 8e8000965f7d1e6948aa129479a27405d8ef5914 (patch) | |
| tree | 8338cc17ab4155bdcc122f547da49c765f4158e2 /sys/netatm/uni | |
| parent | cc85cf676e91fc78a1a6a736affcf63c4a2bdca0 (diff) | |
| download | FreeBSD-src-8e8000965f7d1e6948aa129479a27405d8ef5914.zip FreeBSD-src-8e8000965f7d1e6948aa129479a27405d8ef5914.tar.gz | |
Fix a number of occurences of calling uma_zalloc() with neither
M_WAITOK nor M_NOWAIT.
Diffstat (limited to 'sys/netatm/uni')
| -rw-r--r-- | sys/netatm/uni/unisig_msg.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c index 94a1f6a..edc2d39 100644 --- a/sys/netatm/uni/unisig_msg.c +++ b/sys/netatm/uni/unisig_msg.c @@ -287,7 +287,7 @@ unisig_send_setup(usp, uvp) /* * Get memory for a SETUP message */ - setup = uma_zalloc(unisig_msg_zone, M_ZERO); + setup = uma_zalloc(unisig_msg_zone, M_ZERO | M_NOWAIT); if (setup == NULL) { err = ENOMEM; goto done; @@ -313,7 +313,7 @@ unisig_send_setup(usp, uvp) * specify one in the attribute block */ if (ap->calling.tag != T_ATM_PRESENT) { - setup->msg_ie_cgad = uma_zalloc(unisig_ie_zone, 0); + setup->msg_ie_cgad = uma_zalloc(unisig_ie_zone, M_NOWAIT); if (setup->msg_ie_cgad == NULL) { err = ENOMEM; goto done; @@ -372,11 +372,11 @@ unisig_send_release(usp, uvp, msg, cause) /* * Get memory for a RELEASE message */ - rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO); + rls_msg = uma_zalloc(unisig_msg_zone, M_ZERO | M_NOWAIT); if (rls_msg == NULL) { return(ENOMEM); } - cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO); + cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO | M_NOWAIT); if (cause_ie == NULL) { uma_zfree(unisig_msg_zone, rls_msg); return(ENOMEM); @@ -448,11 +448,11 @@ unisig_send_release_complete(usp, uvp, msg, cause) /* * Get memory for a RELEASE COMPLETE message */ - rls_cmp = uma_zalloc(unisig_msg_zone, M_ZERO); + rls_cmp = uma_zalloc(unisig_msg_zone, M_ZERO | M_NOWAIT); if (rls_cmp == NULL) { return(ENOMEM); } - cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO); + cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO | M_NOWAIT); if (cause_ie == NULL) { uma_zfree(unisig_msg_zone, rls_cmp); return(ENOMEM); @@ -527,16 +527,16 @@ unisig_send_status(usp, uvp, msg, cause) /* * Get memory for a STATUS message */ - stat_msg = uma_zalloc(unisig_msg_zone, M_ZERO); + stat_msg = uma_zalloc(unisig_msg_zone, M_ZERO | M_NOWAIT); if (stat_msg == NULL) { return(ENOMEM); } - cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO); + cause_ie = uma_zalloc(unisig_ie_zone, M_ZERO | M_NOWAIT); if (cause_ie == NULL) { uma_zfree(unisig_msg_zone, stat_msg); return(ENOMEM); } - clst_ie = uma_zalloc(unisig_ie_zone, M_ZERO); + clst_ie = uma_zalloc(unisig_ie_zone, M_ZERO | M_NOWAIT); if (clst_ie == NULL) { uma_zfree(unisig_msg_zone, stat_msg); uma_zfree(unisig_ie_zone, cause_ie); @@ -672,7 +672,7 @@ unisig_rcv_restart(usp, msg) /* * Get memory for a RESTART ACKNOWLEDGE message */ - rsta_msg = uma_zalloc(unisig_msg_zone, 0); + rsta_msg = uma_zalloc(unisig_msg_zone, M_NOWAIT); if (rsta_msg == NULL) { return; } @@ -765,7 +765,7 @@ unisig_rcv_setup(usp, msg) /* * Get a new VCCB for the connection */ - uvp = uma_zalloc(unisig_vc_zone, M_ZERO); + uvp = uma_zalloc(unisig_vc_zone, M_ZERO | M_NOWAIT); if (uvp == NULL) { return; } @@ -835,7 +835,7 @@ unisig_rcv_msg(usp, m) /* * Get storage for the message */ - msg = uma_zalloc(unisig_msg_zone, M_ZERO); + msg = uma_zalloc(unisig_msg_zone, M_ZERO | M_NOWAIT); if (msg == NULL) { err = ENOMEM; goto done; |
