[NET_SCHED]: Remove unnecessary stats_lock pointers

Remove stats_lock pointers from qdisc-internal structures, in all cases
it points to dev->queue_lock. The only case where it is necessary is for
top-level qdiscs, where it might also point to dev->ingress_lock in case
of the ingress qdisc. Also remove it from actions completely, it always
points to the actions internal lock.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 5 deletions

diff --git a/net/sched/act_police.c b/net/sched/act_police.c
index 580698db578a..3e8716dd738c 100644
--- a/net/sched/act_police.c
+++ b/net/sched/act_police.c
@@ -183,7 +183,6 @@ static int tcf_act_police_locate(struct rtattr *rta, struct rtattr *est,
         ret = ACT_P_CREATED;
         police->tcf_refcnt = 1;
         spin_lock_init(&police->tcf_lock);
-        police->tcf_stats_lock = &police->tcf_lock;
         if (bind)
                 police->tcf_bindcnt = 1;
 override:
@@ -231,7 +230,7 @@ override:
         if (est)
                 gen_replace_estimator(&police->tcf_bstats,
                                       &police->tcf_rate_est,
-                                      police->tcf_stats_lock, est);
+                                      &police->tcf_lock, est);
 
         spin_unlock_bh(&police->tcf_lock);
         if (ret != ACT_P_CREATED)
@@ -450,7 +449,6 @@ struct tcf_police *tcf_police_locate(struct rtattr *rta, struct rtattr *est)
 
         police->tcf_refcnt = 1;
         spin_lock_init(&police->tcf_lock);
-        police->tcf_stats_lock = &police->tcf_lock;
         if (parm->rate.rate) {
                 police->tcfp_R_tab =
                         qdisc_get_rtab(&parm->rate, tb[TCA_POLICE_RATE-1]);
@@ -490,7 +488,7 @@ struct tcf_police *tcf_police_locate(struct rtattr *rta, struct rtattr *est)
         police->tcf_action = parm->action;
         if (est)
                 gen_new_estimator(&police->tcf_bstats, &police->tcf_rate_est,
-                                  police->tcf_stats_lock, est);
+                                  &police->tcf_lock, est);
         h = tcf_hash(police->tcf_index, POL_TAB_MASK);
         write_lock_bh(&police_lock);
         police->tcf_next = tcf_police_ht[h];
@@ -591,7 +589,7 @@ int tcf_police_dump_stats(struct sk_buff *skb, struct tcf_police *police)
         struct gnet_dump d;
 
         if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,
-                                         TCA_XSTATS, police->tcf_stats_lock,
+                                         TCA_XSTATS, &police->tcf_lock,
                                          &d) < 0)
                 goto errout;