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

Convert more M_WAITOK malloc() to M_NOWAIT.

Browse Source 
Reported by:	Kim Culhan <w8hdkim gmail.com>
This commit is contained in:
Gleb Smirnoff 2012-09-22 12:49:36 +00:00
parent 901610f4b8
commit 03fb709e1f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=240824
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/contrib/altq/altq/altq_priq.c
View File

@ -362,8 +362,9 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid)
if (flags & PRCF_RIO) {
cl->cl_red = (red_t *)rio_alloc(0, NULL,
red_flags, red_pkttime);
if (cl->cl_red != NULL)
qtype(cl->cl_q) = Q_RIO;
if (cl->cl_red == NULL)
goto err_ret;
qtype(cl->cl_q) = Q_RIO;
} else
#endif
if (flags & PRCF_RED) {
@ -371,8 +372,9 @@ priq_class_create(struct priq_if *pif, int pri, int qlimit, int flags, int qid)
qlimit(cl->cl_q) * 10/100,
qlimit(cl->cl_q) * 30/100,
red_flags, red_pkttime);
if (cl->cl_red != NULL)
qtype(cl->cl_q) = Q_RED;
if (cl->cl_red == NULL)
goto err_ret;
qtype(cl->cl_q) = Q_RED;
}
}
#endif /* ALTQ_RED */

3
sys/contrib/altq/altq/altq_red.c
View File

@ -231,10 +231,9 @@ red_alloc(int weight, int inv_pmax, int th_min, int th_max, int flags,
int w, i;
int npkts_per_sec;
rp = malloc(sizeof(red_t), M_DEVBUF, M_WAITOK);
rp = malloc(sizeof(red_t), M_DEVBUF, M_NOWAIT | M_ZERO);
if (rp == NULL)
return (NULL);
bzero(rp, sizeof(red_t));
rp->red_avg = 0;
rp->red_idle = 1;

3
sys/contrib/altq/altq/altq_rio.c
View File

@ -204,10 +204,9 @@ rio_alloc(int weight, struct redparams *params, int flags, int pkttime)
int w, i;
int npkts_per_sec;
rp = malloc(sizeof(rio_t), M_DEVBUF, M_WAITOK);
rp = malloc(sizeof(rio_t), M_DEVBUF, M_NOWAIT | M_ZERO);
if (rp == NULL)
return (NULL);
bzero(rp, sizeof(rio_t));
rp->rio_flags = flags;
if (pkttime == 0)