From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ismail Donmez Subject: [PATCH] Revert [NET_SCHED]: HTB: fix incorrect use of RB_EMPTY_NODE Date: Sat, 30 Sep 2006 22:23:46 +0300 Message-ID: <200609302223.47627.ismail@pardus.org.tr> Mime-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_DRsHFxAcZZUrmvc" Cc: axboe@suse.de, Herbert Xu Return-path: Received: from ns2.uludag.org.tr ([193.140.100.220]:26759 "EHLO uludag.org.tr") by vger.kernel.org with ESMTP id S1751455AbWI3TXY (ORCPT ); Sat, 30 Sep 2006 15:23:24 -0400 To: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org --Boundary-00=_DRsHFxAcZZUrmvc Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, With commit 10fd48f2376db52f08bf0420d2c4f580e39269e1 [1] , RB_EMPTY_NODE changed behaviour so it returns false when the node is empty as expected. Hence Herbert's fix for sched_htb.c should be reverted. [1] http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=10fd48f2376db52f08bf0420d2c4f580e39269e1;hp=9817064b68fef7e4580c6df1ea597e106b9ff88b Regards, ismail -- They that can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety. -- Benjamin Franklin --Boundary-00=_DRsHFxAcZZUrmvc Content-Type: text/x-diff; charset="utf-8"; name="rb.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="rb.diff" diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 6c058e3..1f1360e 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c @@ -391,7 +391,7 @@ static inline void htb_add_class_to_row( /* If this triggers, it is a bug in this code, but it need not be fatal */ static void htb_safe_rb_erase(struct rb_node *rb, struct rb_root *root) { - if (!RB_EMPTY_NODE(rb)) { + if (RB_EMPTY_NODE(rb)) { WARN_ON(1); } else { rb_erase(rb, root); --Boundary-00=_DRsHFxAcZZUrmvc--