diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-07-25 21:43:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-25 21:43:18 -0700 |
| commit | 547b792cac0a038b9dbf958d3c120df3740b5572 (patch) | |
| tree | 08554d083b0ca7d65739dc1ce12f9b12a9b8e1f8 /net/sched/sch_cbq.c | |
| parent | 53e5e96ec18da6f65e89f05674711e1c93d8df67 (diff) | |
| download | linux-547b792cac0a038b9dbf958d3c120df3740b5572.tar.gz linux-547b792cac0a038b9dbf958d3c120df3740b5572.tar.bz2 linux-547b792cac0a038b9dbf958d3c120df3740b5572.zip | |
net: convert BUG_TRAP to generic WARN_ON
Removes legacy reinvent-the-wheel type thing. The generic
machinery integrates much better to automated debugging aids
such as kerneloops.org (and others), and is unambiguous due to
better naming. Non-intuively BUG_TRAP() is actually equal to
WARN_ON() rather than BUG_ON() though some might actually be
promoted to BUG_ON() but I left that to future.
I could make at least one BUILD_BUG_ON conversion.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_cbq.c')
| -rw-r--r-- | net/sched/sch_cbq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index f1d2f8ec8b4c..14954bf4a683 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c @@ -1175,7 +1175,7 @@ static void cbq_unlink_class(struct cbq_class *this) this->tparent->children = NULL; } } else { - BUG_TRAP(this->sibling == this); + WARN_ON(this->sibling != this); } } @@ -1699,7 +1699,7 @@ static void cbq_destroy_class(struct Qdisc *sch, struct cbq_class *cl) { struct cbq_sched_data *q = qdisc_priv(sch); - BUG_TRAP(!cl->filters); + WARN_ON(cl->filters); tcf_destroy_chain(&cl->filter_list); qdisc_destroy(cl->q); |