Message ID | 20190327032942.20473-7-dsahern@kernel.org |
---|---|
State | Changes Requested |
Delegated to: | David Miller |
Headers | show |
Series | net: Move fib_nh and fib6_nh to a common struct | expand |
On Tue, Mar 26, 2019 at 08:29:35PM -0700, David Ahern wrote: > 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 269ad7b9cdbb..4923a5f88e9b 100644 > --- a/net/ipv6/route.c > +++ b/net/ipv6/route.c > @@ -3012,6 +3012,14 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, > return err; > } > > +void fib6_nh_release(struct fib6_nh *fib6_nh) > +{ > + if (fib6_nh->nh_dev) > + dev_put(fib6_nh->nh_dev); > + > + lwtstate_put(fib6_nh->nh_lwtstate); Why did you flip the order? lwtstate_put() dev_put() is symmetric with fib6_nh_init() > +}
On 3/27/19 2:38 AM, Ido Schimmel wrote: > Why did you flip the order? > > lwtstate_put() > dev_put() > > is symmetric with fib6_nh_init() no real reason. Will reverse them
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 269ad7b9cdbb..4923a5f88e9b 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -3012,6 +3012,14 @@ int fib6_nh_init(struct net *net, struct fib6_nh *fib6_nh, return err; } +void fib6_nh_release(struct fib6_nh *fib6_nh) +{ + if (fib6_nh->nh_dev) + dev_put(fib6_nh->nh_dev); + + lwtstate_put(fib6_nh->nh_lwtstate); +} + static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg, gfp_t gfp_flags, struct netlink_ext_ack *extack)