d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a number of occurences of calling uma_zalloc() with neither

Browse Source 
M_WAITOK nor M_NOWAIT.
This commit is contained in:
Hartmut Brandt 2003-07-18 16:36:41 +00:00
parent 95f4c5d29d
commit 084fb28576
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/netatm/atm_subr.c
View File

@ -384,7 +384,7 @@ atm_stack_enq(cmd, func, token, cvp, arg1, arg2)
/*
* Get a new queue entry for this call
*/
sqp = uma_zalloc(atm_stackq_zone, M_ZERO);
sqp = uma_zalloc(atm_stackq_zone, M_NOWAIT | M_ZERO);
if (sqp == NULL) {
(void) splx(s);
return (ENOMEM);

24
sys/netatm/uni/unisig_msg.c
View File

@ -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;