From 64f10ca67b38a5525603fcf62ab342815b2ff293 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 18 Aug 2008 21:03:15 -0700
Subject: [PATCH] --- yaml --- r: 108823 b: refs/heads/master c:
 4d8863a29c4755a0461cd31b6865026187d6c43a h: refs/heads/master i:   108821:
 96baf0622cbb06dc0160c76e280058c05a6c5403   108819:
 2a6a77ce1a2a75849271c42e9145a76a5f9ad861   108815:
 fee289beb48c8102c987d0c7d66d80b56a7c9cd6 v: v3

---
 [refs]                        |  2 +-
 trunk/net/sched/sch_api.c     | 13 ++-----------
 trunk/net/sched/sch_generic.c |  6 ------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index 6081b0dfaa0e..1f0cd2c82617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25bfcd5a78a377ea4c54a3c21e44590e2fc478a6
+refs/heads/master: 4d8863a29c4755a0461cd31b6865026187d6c43a
diff --git a/trunk/net/sched/sch_api.c b/trunk/net/sched/sch_api.c
index 7d7070b1eebd..d91a2338877c 100644
--- a/trunk/net/sched/sch_api.c
+++ b/trunk/net/sched/sch_api.c
@@ -638,11 +638,8 @@ static void notify_and_destroy(struct sk_buff *skb, struct nlmsghdr *n, u32 clid
 	if (new || old)
 		qdisc_notify(skb, n, clid, old, new);
 
-	if (old) {
-		sch_tree_lock(old);
+	if (old)
 		qdisc_destroy(old);
-		sch_tree_unlock(old);
-	}
 }
 
 /* Graft qdisc "new" to class "classid" of qdisc "parent" or
@@ -1092,16 +1089,10 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
 
 graft:
 	if (1) {
-		spinlock_t *root_lock;
-
 		err = qdisc_graft(dev, p, skb, n, clid, q, NULL);
 		if (err) {
-			if (q) {
-				root_lock = qdisc_root_lock(q);
-				spin_lock_bh(root_lock);
+			if (q)
 				qdisc_destroy(q);
-				spin_unlock_bh(root_lock);
-			}
 			return err;
 		}
 	}
diff --git a/trunk/net/sched/sch_generic.c b/trunk/net/sched/sch_generic.c
index 6f96b7bc0809..c3ed4d44fc14 100644
--- a/trunk/net/sched/sch_generic.c
+++ b/trunk/net/sched/sch_generic.c
@@ -518,8 +518,6 @@ void qdisc_reset(struct Qdisc *qdisc)
 }
 EXPORT_SYMBOL(qdisc_reset);
 
-/* Under qdisc_lock(qdisc) and BH! */
-
 void qdisc_destroy(struct Qdisc *qdisc)
 {
 	const struct Qdisc_ops  *ops = qdisc->ops;
@@ -712,14 +710,10 @@ static void shutdown_scheduler_queue(struct net_device *dev,
 	struct Qdisc *qdisc_default = _qdisc_default;
 
 	if (qdisc) {
-		spinlock_t *root_lock = qdisc_lock(qdisc);
-
 		dev_queue->qdisc = qdisc_default;
 		dev_queue->qdisc_sleeping = qdisc_default;
 
-		spin_lock_bh(root_lock);
 		qdisc_destroy(qdisc);
-		spin_unlock_bh(root_lock);
 	}
 }