Skip to content

Commit

Permalink
pkt_sched: Kill qdisc_lock_tree usage in cls_route.c
Browse files Browse the repository at this point in the history
It just wants the qdisc tree to be synchronized, so grabbing
qdisc_root_lock() is sufficient.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jul 18, 2008
1 parent 55dbc64 commit 15b458f
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions net/sched/cls_route.c
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,13 @@ static __inline__ int route4_fastmap_hash(u32 id, int iif)
}

static inline
void route4_reset_fastmap(struct net_device *dev, struct route4_head *head, u32 id)
void route4_reset_fastmap(struct Qdisc *q, struct route4_head *head, u32 id)
{
qdisc_lock_tree(dev);
spinlock_t *root_lock = qdisc_root_lock(q);

spin_lock_bh(root_lock);
memset(head->fastmap, 0, sizeof(head->fastmap));
qdisc_unlock_tree(dev);
spin_unlock_bh(root_lock);
}

static inline void
Expand Down Expand Up @@ -302,7 +304,7 @@ static int route4_delete(struct tcf_proto *tp, unsigned long arg)
*fp = f->next;
tcf_tree_unlock(tp);

route4_reset_fastmap(qdisc_dev(tp->q), head, f->id);
route4_reset_fastmap(tp->q, head, f->id);
route4_delete_filter(tp, f);

/* Strip tree */
Expand Down Expand Up @@ -500,7 +502,7 @@ static int route4_change(struct tcf_proto *tp, unsigned long base,
}
tcf_tree_unlock(tp);

route4_reset_fastmap(qdisc_dev(tp->q), head, f->id);
route4_reset_fastmap(tp->q, head, f->id);
*arg = (unsigned long)f;
return 0;

Expand Down

0 comments on commit 15b458f

Please sign in to comment.