On Tue, 7 Nov 2006 07:49:43 +0100
Jarek Poplawski <[EMAIL PROTECTED]> wrote:
> On Mon, Nov 06, 2006 at 09:44:49AM -0800, Stephen Hemminger wrote:
> > On Mon, 6 Nov 2006 12:33:53 +0100
> > Jarek Poplawski <[EMAIL PROTECTED]> wrote:
> >
> > > After hlist_del() next and pprev pointers are not NULL
> > > so hlist_unhashed() doesn't work properly.
> > >
> > >
> > > Signed-off-by: Jarek Poplawski <[EMAIL PROTECTED]>
> > > ---
> > >
> > >
> > > diff -Nurp linux-2.6.19-rc4-git10-/net/sched/sch_htb.c
> > > linux-2.6.19-rc4-git10/net/sched/sch_htb.c
> > > --- linux-2.6.19-rc4-git10-/net/sched/sch_htb.c 2006-11-06
> > > 11:42:41.000000000 +0100
> > > +++ linux-2.6.19-rc4-git10/net/sched/sch_htb.c 2006-11-06
> > > 11:53:15.000000000 +0100
> > > @@ -1284,8 +1284,10 @@ static void htb_destroy_class(struct Qdi
> > > struct htb_class, sibling));
> > >
> > > /* note: this delete may happen twice (see htb_delete) */
> > > - if (!hlist_unhashed(&cl->hlist))
> > > + if (!hlist_unhashed(&cl->hlist)) {
> > > hlist_del(&cl->hlist);
> > > + INIT_HLIST_NODE(&cl->hlist);
> > > + }
> >
> > why not use hlist_del_init?
Your patch duplicated the code in hlist_del_init(). Why not do:
--- a/net/sched/sch_htb.c 2006-11-07 09:48:22.000000000 -0800
+++ b/net/sched/sch_htb.c 2006-11-07 09:49:01.000000000 -0800
@@ -1284,8 +1284,7 @@
struct htb_class, sibling));
/* note: this delete may happen twice (see htb_delete) */
- if (!hlist_unhashed(&cl->hlist))
- hlist_del(&cl->hlist);
+ hlist_del_init(&cl->hlist);
list_del(&cl->sibling);
if (cl->prio_activity)
@@ -1333,8 +1332,7 @@
sch_tree_lock(sch);
/* delete from hash and active; remainder in destroy_class */
- if (!hlist_unhashed(&cl->hlist))
- hlist_del(&cl->hlist);
+ hlist_del_init(&cl->hlist);
if (cl->prio_activity)
htb_deactivate(q, cl);
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
