Commit 762c8dc7 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by Paolo Abeni
Browse files

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



Since commit 1202cdd6("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: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Link: https://lore.kernel.org/r/20230911125045.346390-1-shaozhengchao@huawei.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent be3af13f

include/net/dst.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/core/dst.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

net/ipv4/route.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

net/ipv6/route.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/openvswitch/actions.c

+2 −2
Original line number Diff line number Diff line
@@ -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;