net: Move free of dst_metrics to helper

Move the refcounting and potential free of dst metrics associated
for ipv4 and ipv6 to a common helper.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ip.h b/include/net/ip.h
index f9a7125b4bdab3ce91e22d3eb0a5f6c07661ff1a..72593e171d14c83cc2c005f219bf7277f25b24f5 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -441,6 +441,15 @@ void ip_dst_init_metrics(struct dst_entry *dst, struct dst_metrics *fib_metrics)
        }
 }
 
+static inline
+void ip_dst_metrics_put(struct dst_entry *dst)
+{
+       struct dst_metrics *p = (struct dst_metrics *)DST_METRICS_PTR(dst);
+
+       if (p != &dst_default_metrics && refcount_dec_and_test(&p->refcnt))
+               kfree(p);
+}
+
 u32 ip_idents_reserve(u32 hash, int segs);
 void __ip_select_ident(struct net *net, struct iphdr *iph, int segs);
 

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 8ccbc8f2c2ccf091ccfa42265b1421af8ccc2d07..f71d2395c42805c2720d00cebf87a88da80e90ef 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1476,12 +1476,9 @@ void rt_del_uncached_list(struct rtable *rt)
 
 static void ipv4_dst_destroy(struct dst_entry *dst)
 {
-       struct dst_metrics *p = (struct dst_metrics *)DST_METRICS_PTR(dst);
        struct rtable *rt = (struct rtable *)dst;
 
-       if (p != &dst_default_metrics && refcount_dec_and_test(&p->refcnt))
-               kfree(p);
-
+       ip_dst_metrics_put(dst);
        rt_del_uncached_list(rt);
 }
 

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index b91a9d3cf28841e4a6c5acd7f940b9fcade6fcd8..6c1d817151cae45421dc976c5ea082b4115650be 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -364,14 +364,11 @@ EXPORT_SYMBOL(ip6_dst_alloc);
 
 static void ip6_dst_destroy(struct dst_entry *dst)
 {
-       struct dst_metrics *p = (struct dst_metrics *)DST_METRICS_PTR(dst);
        struct rt6_info *rt = (struct rt6_info *)dst;
        struct fib6_info *from;
        struct inet6_dev *idev;
 
-       if (p != &dst_default_metrics && refcount_dec_and_test(&p->refcnt))
-               kfree(p);
-
+       ip_dst_metrics_put(dst);
        rt6_uncached_list_del(rt);
 
        idev = rt->rt6i_idev;