[PATCH v2 net-next 06/13] ipv6: Create cleanup helper for fib6_nh

David Ahern
2019-03-27T18:37:53Z

Move the fib6_nh cleanup code to a new helper, fib6_nh_release.

Signed-off-by: David Ahern <dsahern@gmail.com>
---
include/net/ip6_fib.h | 1 +
net/ipv6/ip6_fib.c | 5 +----
net/ipv6/route.c | 8 ++++++++
3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index ce1f81345c8e..2d2a468b3d6d 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -447,6 +447,7 @@ static inline struct net_device *fib6_info_nh_dev(const struct fib6_info *f6i)
int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,
struct fib6_config *cfg, gfp_t gfp_flags,
struct netlink_ext_ack *extack);
+void fib6_nh_release(struct fib6_nh *fib6_nh);

static inline
struct lwtunnel_state *fib6_info_nh_lwt(const struct fib6_info *f6i)
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 6613d8dbb0e5..db886085369b 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -199,10 +199,7 @@ void fib6_info_destroy_rcu(struct rcu_head *head)
free_percpu(f6i->rt6i_pcpu);
}

- lwtstate_put(f6i->fib6_nh.nh_lwtstate);
-
- if (f6i->fib6_nh.nh_dev)
- dev_put(f6i->fib6_nh.nh_dev);
+ fib6_nh_release(&f6i->fib6_nh);

ip_fib_metrics_put(f6i->fib6_metrics);

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index e577d2d51b5f..bd910a266aa7 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3016,6 +3016,14 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh,
return err;
}

+void fib6_nh_release(struct fib6_nh *fib6_nh)
+{
+ lwtstate_put(fib6_nh->nh_lwtstate);
+
+ if (fib6_nh->nh_dev)
+ dev_put(fib6_nh->nh_dev);
+}
+
static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg,
gfp_t gfp_flags,
struct netlink_ext_ack *extack)
--
2.11.0