lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pkt_sched: sch_htb: Optimize WARN_ONs in htb_dequeue_tree() etc.

Browse Source 
We can skip WARN_ON() in htb_dequeue_tree() because there should be
always a similar warning from htb_lookup_leaf() earlier.

The first WARN_ON() in in htb_lookup_leaf() is changed to BUG_ON()
because most likly this should end with oops anyway.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jarek Poplawski
2008-12-09 22:35:02 -08:00
committed by David S. Miller
parent 1b5c0077e1
commit 512bb43eb5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/sched/sch_htb.c
View File

@@ -726,7 +726,7 @@ static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio,
u32 *pid; u32 *pid;
} stk[TC_HTB_MAXDEPTH], *sp = stk; } stk[TC_HTB_MAXDEPTH], *sp = stk;
WARN_ON(!tree->rb_node); BUG_ON(!tree->rb_node);
sp->root = tree->rb_node; sp->root = tree->rb_node;
sp->pptr = pptr; sp->pptr = pptr;
sp->pid = pid; sp->pid = pid;
@@ -746,9 +746,10 @@ static struct htb_class *htb_lookup_leaf(struct rb_root *tree, int prio,
*sp->pptr = (*sp->pptr)->rb_left; *sp->pptr = (*sp->pptr)->rb_left;
if (sp > stk) { if (sp > stk) {
sp--; sp--;
WARN_ON(!*sp->pptr); if (!*sp->pptr) {
if (!*sp->pptr) WARN_ON(1);
return NULL; return NULL;
}
htb_next_rb_node(sp->pptr); htb_next_rb_node(sp->pptr);
} }
} else { } else {
@@ -779,8 +780,7 @@ static struct sk_buff *htb_dequeue_tree(struct htb_sched *q, int prio,
do { do {
next: next:
WARN_ON(!cl); if (unlikely(!cl))
if (!cl)
return NULL; return NULL;
/* class can be empty - it is unlikely but can be true if leaf /* class can be empty - it is unlikely but can be true if leaf