Re: panic 2.6.27-rc3-git2, qdisc_dequeue_head

[Jarek Poplawski <jarkao2@gmail.com>]

On Sun, Aug 17, 2008 at 12:02:13PM +0300, Denys Fedoryshchenko wrote:
> Is it was a fix? Because for now it is running fine from night (but i have 
> enabled some minor debug options in kernel). No crash or warning yet.
> 
> I disable now debug as it was before and testing more.
> 

Only the patch named "take #3" is debugging only, and the latter 2
patches were intended to fix things. As a matter of fact the first
fixing patch should be needed as well, so if it's possible try to add
it again without reverting anything. It can show some minor offset
while applying now. I resend it below for any case.

Thanks,
Jarek P.

---

 include/net/sch_generic.h |    5 +++++
 net/sched/sch_api.c       |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index a7abfda..4f28fa7 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -193,6 +193,11 @@ static inline struct Qdisc *qdisc_root(struct Qdisc *qdisc)
 	return qdisc->dev_queue->qdisc;
 }
 
+static inline struct Qdisc *qdisc_root_sleeping(struct Qdisc *qdisc)
+{
+	return qdisc->dev_queue->qdisc_sleeping;
+}
+
 /* The qdisc root lock is a mechanism by which to top level
  * of a qdisc tree can be locked from any qdisc node in the
  * forest.  This allows changing the configuration of some
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index c25465e..5c7ae56 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -435,7 +435,7 @@ void qdisc_watchdog_init(struct qdisc_watchdog *wd, struct Qdisc *qdisc)
 {
 	hrtimer_init(&wd->timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
 	wd->timer.function = qdisc_watchdog;
-	wd->qdisc = qdisc;
+	wd->qdisc = qdisc_root_sleeping(qdisc);
 }
 EXPORT_SYMBOL(qdisc_watchdog_init);