Skip to content

Commit

Permalink
pkt_sched: Remove qdisc_lock_tree usage in cls_api.c
Browse files Browse the repository at this point in the history
It just wants the qdisc tree for the filter to be synchronized.
So just BH lock qdisc_root_lock(q) instead.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 18, 2008
1 parent 17715e6 commit 55dbc64
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions net/sched/cls_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
{
struct net *net = sock_net(skb->sk);
struct nlattr *tca[TCA_MAX + 1];
spinlock_t *root_lock;
struct tcmsg *t;
u32 protocol;
u32 prio;
Expand Down Expand Up @@ -204,6 +205,8 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
}
}

root_lock = qdisc_root_lock(q);

if (tp == NULL) {
/* Proto-tcf does not exist, create new one */

Expand Down Expand Up @@ -263,10 +266,10 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
goto errout;
}

qdisc_lock_tree(dev);
spin_lock_bh(root_lock);
tp->next = *back;
*back = tp;
qdisc_unlock_tree(dev);
spin_unlock_bh(root_lock);

} else if (tca[TCA_KIND] && nla_strcmp(tca[TCA_KIND], tp->ops->kind))
goto errout;
Expand All @@ -275,9 +278,9 @@ static int tc_ctl_tfilter(struct sk_buff *skb, struct nlmsghdr *n, void *arg)

if (fh == 0) {
if (n->nlmsg_type == RTM_DELTFILTER && t->tcm_handle == 0) {
qdisc_lock_tree(dev);
spin_lock_bh(root_lock);
*back = tp->next;
qdisc_unlock_tree(dev);
spin_lock_bh(root_lock);

tfilter_notify(skb, n, tp, fh, RTM_DELTFILTER);
tcf_destroy(tp);
Expand Down

0 comments on commit 55dbc64

Please sign in to comment.