net: dst: remove unnecessary input parameter in dst_alloc and dst_init

Since commit 1202cdd66531("Remove DECnet support from kernel") has been
merged, all callers pass in the initial_ref value of 1 when they call
dst_alloc(). Therefore, remove initial_ref when the dst_alloc() is
declared and replace initial_ref with 1 in dst_alloc().
Also when all callers call dst_init(), the value of initial_ref is 1.
Therefore, remove the input parameter initial_ref of the dst_init() and
replace initial_ref with the value 1 in dst_init.

Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
Link: https://lore.kernel.org/r/20230911125045.346390-1-shaozhengchao@huawei.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/include/net/dst.h b/include/net/dst.h
index 78884429deed82cc4872ff30404af69aee11a333..f8b8599a0600bea45232a40a66df9683e8d06e66 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -392,10 +392,10 @@ static inline int dst_discard(struct sk_buff *skb)
 {
        return dst_discard_out(&init_net, skb->sk, skb);
 }
-void *dst_alloc(struct dst_ops *ops, struct net_device *dev, int initial_ref,
+void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
                int initial_obsolete, unsigned short flags);
 void dst_init(struct dst_entry *dst, struct dst_ops *ops,
-             struct net_device *dev, int initial_ref, int initial_obsolete,
+             struct net_device *dev, int initial_obsolete,
              unsigned short flags);
 struct dst_entry *dst_destroy(struct dst_entry *dst);
 void dst_dev_put(struct dst_entry *dst);

diff --git a/net/core/dst.c b/net/core/dst.c
index 980e2fd2f013b3e50cc47ed0666ee5f24f50444b..6838d3212c37436859a3649a652f2388b00268de 100644 (file)
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -45,7 +45,7 @@ const struct dst_metrics dst_default_metrics = {
 EXPORT_SYMBOL(dst_default_metrics);
 
 void dst_init(struct dst_entry *dst, struct dst_ops *ops,
-             struct net_device *dev, int initial_ref, int initial_obsolete,
+             struct net_device *dev, int initial_obsolete,
              unsigned short flags)
 {
        dst->dev = dev;
@@ -66,7 +66,7 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops,
        dst->tclassid = 0;
 #endif
        dst->lwtstate = NULL;
-       rcuref_init(&dst->__rcuref, initial_ref);
+       rcuref_init(&dst->__rcuref, 1);
        INIT_LIST_HEAD(&dst->rt_uncached);
        dst->__use = 0;
        dst->lastuse = jiffies;
@@ -77,7 +77,7 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops,
 EXPORT_SYMBOL(dst_init);
 
 void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
-               int initial_ref, int initial_obsolete, unsigned short flags)
+               int initial_obsolete, unsigned short flags)
 {
        struct dst_entry *dst;
 
@@ -90,7 +90,7 @@ void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
        if (!dst)
                return NULL;
 
-       dst_init(dst, ops, dev, initial_ref, initial_obsolete, flags);
+       dst_init(dst, ops, dev, initial_obsolete, flags);
 
        return dst;
 }
@@ -270,7 +270,7 @@ static void __metadata_dst_init(struct metadata_dst *md_dst,
        struct dst_entry *dst;
 
        dst = &md_dst->dst;
-       dst_init(dst, &dst_blackhole_ops, NULL, 1, DST_OBSOLETE_NONE,
+       dst_init(dst, &dst_blackhole_ops, NULL, DST_OBSOLETE_NONE,
                 DST_METADATA | DST_NOCOUNT);
        memset(dst + 1, 0, sizeof(*md_dst) + optslen - sizeof(*dst));
        md_dst->type = type;

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 66f419e7f9a7f3cab5328abb8c374686dccd2f19..fb3045692b99fb53c4c2b95832322e9e70b491b4 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1630,7 +1630,7 @@ struct rtable *rt_dst_alloc(struct net_device *dev,
 {
        struct rtable *rt;
 
-       rt = dst_alloc(&ipv4_dst_ops, dev, 1, DST_OBSOLETE_FORCE_CHK,
+       rt = dst_alloc(&ipv4_dst_ops, dev, DST_OBSOLETE_FORCE_CHK,
                       (noxfrm ? DST_NOXFRM : 0));
 
        if (rt) {
@@ -1658,7 +1658,7 @@ struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt)
 {
        struct rtable *new_rt;
 
-       new_rt = dst_alloc(&ipv4_dst_ops, dev, 1, DST_OBSOLETE_FORCE_CHK,
+       new_rt = dst_alloc(&ipv4_dst_ops, dev, DST_OBSOLETE_FORCE_CHK,
                           rt->dst.flags);
 
        if (new_rt) {
@@ -2832,7 +2832,7 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or
        struct rtable *ort = (struct rtable *) dst_orig;
        struct rtable *rt;
 
-       rt = dst_alloc(&ipv4_dst_blackhole_ops, NULL, 1, DST_OBSOLETE_DEAD, 0);
+       rt = dst_alloc(&ipv4_dst_blackhole_ops, NULL, DST_OBSOLETE_DEAD, 0);
        if (rt) {
                struct dst_entry *new = &rt->dst;
 

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 9c687b357e6a41dcbc1011d43766ab1fb0e55a39..9d8dfc7423e49af6df6ddc95ddf235b0b2b758ef 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -341,7 +341,7 @@ struct rt6_info *ip6_dst_alloc(struct net *net, struct net_device *dev,
                               int flags)
 {
        struct rt6_info *rt = dst_alloc(&net->ipv6.ip6_dst_ops, dev,
-                                       1, DST_OBSOLETE_FORCE_CHK, flags);
+                                       DST_OBSOLETE_FORCE_CHK, flags);
 
        if (rt) {
                rt6_info_init(rt);
@@ -2655,7 +2655,7 @@ struct dst_entry *ip6_blackhole_route(struct net *net, struct dst_entry *dst_ori
        struct net_device *loopback_dev = net->loopback_dev;
        struct dst_entry *new = NULL;
 
-       rt = dst_alloc(&ip6_dst_blackhole_ops, loopback_dev, 1,
+       rt = dst_alloc(&ip6_dst_blackhole_ops, loopback_dev,
                       DST_OBSOLETE_DEAD, 0);
        if (rt) {
                rt6_info_init(rt);

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index fd66014d8a76ad40ba807bd7ca38f3eb099cb78b..5f8094acd05676eb5edbbea9952c29ce5e8f6d4f 100644 (file)
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -873,7 +873,7 @@ static void ovs_fragment(struct net *net, struct vport *vport,
 
                prepare_frag(vport, skb, orig_network_offset,
                             ovs_key_mac_proto(key));
-               dst_init(&ovs_rt.dst, &ovs_dst_ops, NULL, 1,
+               dst_init(&ovs_rt.dst, &ovs_dst_ops, NULL,
                         DST_OBSOLETE_NONE, DST_NOCOUNT);
                ovs_rt.dst.dev = vport->dev;
 
@@ -890,7 +890,7 @@ static void ovs_fragment(struct net *net, struct vport *vport,
                prepare_frag(vport, skb, orig_network_offset,
                             ovs_key_mac_proto(key));
                memset(&ovs_rt, 0, sizeof(ovs_rt));
-               dst_init(&ovs_rt.dst, &ovs_dst_ops, NULL, 1,
+               dst_init(&ovs_rt.dst, &ovs_dst_ops, NULL,
                         DST_OBSOLETE_NONE, DST_NOCOUNT);
                ovs_rt.dst.dev = vport->dev;
 

diff --git a/net/sched/sch_frag.c b/net/sched/sch_frag.c
index a9bd0a23589048dbbf954ce685814efea539f51a..ce63414185fd6dcb7e3544b9302aeb41a49c19b3 100644 (file)
--- a/net/sched/sch_frag.c
+++ b/net/sched/sch_frag.c
@@ -96,7 +96,7 @@ static int sch_fragment(struct net *net, struct sk_buff *skb,
                unsigned long orig_dst;
 
                sch_frag_prepare_frag(skb, xmit);
-               dst_init(&sch_frag_rt.dst, &sch_frag_dst_ops, NULL, 1,
+               dst_init(&sch_frag_rt.dst, &sch_frag_dst_ops, NULL,
                         DST_OBSOLETE_NONE, DST_NOCOUNT);
                sch_frag_rt.dst.dev = skb->dev;
 
@@ -112,7 +112,7 @@ static int sch_fragment(struct net *net, struct sk_buff *skb,
 
                sch_frag_prepare_frag(skb, xmit);
                memset(&sch_frag_rt, 0, sizeof(sch_frag_rt));
-               dst_init(&sch_frag_rt.dst, &sch_frag_dst_ops, NULL, 1,
+               dst_init(&sch_frag_rt.dst, &sch_frag_dst_ops, NULL,
                         DST_OBSOLETE_NONE, DST_NOCOUNT);
                sch_frag_rt.dst.dev = skb->dev;
 

diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
index d6b405782b6361c4da2e06fae50befbd699aed15..c4c4fc29ccf5a264866ea42b80acd83e2af6562f 100644 (file)
--- a/net/xfrm/xfrm_policy.c
+++ b/net/xfrm/xfrm_policy.c
@@ -2561,7 +2561,7 @@ static inline struct xfrm_dst *xfrm_alloc_dst(struct net *net, int family)
        default:
                BUG();
        }
-       xdst = dst_alloc(dst_ops, NULL, 1, DST_OBSOLETE_NONE, 0);
+       xdst = dst_alloc(dst_ops, NULL, DST_OBSOLETE_NONE, 0);
 
        if (likely(xdst)) {
                memset_after(xdst, 0, u.dst);