From 3a76e3716b4e571f5d91a20b6afb412560599083 Mon Sep 17 00:00:00 2001
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Sun, 17 Aug 2008 22:02:11 -0700
Subject: [PATCH] pkt_sched: Grab correct lock in notify_and_destroy().
From: Jarek Poplawski <jarkao2@gmail.com>
When we are destroying non-root qdiscs, we need to lock
the root of the qdisc tree not the the qdisc itself.
Signed-off-by: David S. Miller <davem@davemloft.net>
---
net/sched/sch_api.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index c25465e5607a..c8dc72e12107 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -638,9 +638,9 @@ static void notify_and_destroy(struct sk_buff *skb, struct nlmsghdr *n, u32 clid
qdisc_notify(skb, n, clid, old, new);
if (old) {
- spin_lock_bh(&old->q.lock);
+ sch_tree_lock(old);
qdisc_destroy(old);
- spin_unlock_bh(&old->q.lock);
+ sch_tree_unlock(old);
}
}
--
2.20.1