From: Ido Schimmel <idosch@mellanox.com>
To: David Ahern <dsahern@kernel.org>
Cc: "davem@davemloft.net" <davem@davemloft.net>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Jiri Pirko <jiri@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>,
David Ahern <dsahern@gmail.com>
Subject: Re: [PATCH net-next 06/13] ipv6: Create cleanup helper for fib6_nh
Date: Wed, 27 Mar 2019 08:38:53 +0000 [thread overview]
Message-ID: <20190327083851.GA15127@splinter> (raw)
In-Reply-To: <20190327032942.20473-7-dsahern@kernel.org>
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()
> +}
next prev parent reply other threads:[~2019-03-27 8:38 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-27 3:29 [PATCH net-next 00/13] net: Move fib_nh and fib6_nh to a common struct David Ahern
2019-03-27 3:29 ` [PATCH net-next 01/13] ipv4: Define fib_get_nhs when CONFIG_IP_ROUTE_MULTIPATH is disabled David Ahern
2019-03-27 7:40 ` Ido Schimmel
2019-03-27 3:29 ` [PATCH net-next 02/13] ipv4: Move IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN to helper David Ahern
2019-03-27 7:44 ` Ido Schimmel
2019-03-27 3:29 ` [PATCH net-next 03/13] ipv4: Create init helper for fib_nh David Ahern
2019-03-27 8:12 ` Ido Schimmel
2019-03-27 14:17 ` David Ahern
2019-03-27 3:29 ` [PATCH net-next 04/13] ipv4: Create cleanup " David Ahern
2019-03-27 8:17 ` Ido Schimmel
2019-03-27 3:29 ` [PATCH net-next 05/13] ipv6: Create init helper for fib6_nh David Ahern
2019-03-27 8:34 ` Ido Schimmel
2019-03-27 3:29 ` [PATCH net-next 06/13] ipv6: Create cleanup " David Ahern
2019-03-27 8:38 ` Ido Schimmel [this message]
2019-03-27 14:17 ` David Ahern
2019-03-27 3:29 ` [PATCH net-next 07/13] ipv6: Move gateway checks to a fib6_nh setting David Ahern
2019-03-27 9:08 ` Ido Schimmel
2019-03-27 14:21 ` David Ahern
2019-03-27 3:29 ` [PATCH net-next 08/13] ipv6: Refactor fib6_ignore_linkdown David Ahern
2019-03-27 9:19 ` Ido Schimmel
2019-03-27 3:29 ` [PATCH net-next 09/13] ipv6: Change rt6_add_nexthop and rt6_nexthop_info to take fib6_nh David Ahern
2019-03-27 9:24 ` Ido Schimmel
2019-03-27 3:29 ` [PATCH net-next 10/13] ipv4: Rename fib_nh entries David Ahern
2019-03-27 3:29 ` [PATCH net-next 11/13] ipv6: Rename fib6_nh entries David Ahern
2019-03-27 3:29 ` [PATCH net-next 12/13] net: Add fib_nh_common and update fib_nh and fib6_nh David Ahern
2019-03-27 9:54 ` Ido Schimmel
2019-03-27 3:29 ` [PATCH net-next 13/13] net: Use common nexthop init and release helpers David Ahern
2019-03-27 9:46 ` Ido Schimmel
2019-03-27 14:22 ` David Ahern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190327083851.GA15127@splinter \
--to=idosch@mellanox.com \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=dsahern@kernel.org \
--cc=jiri@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).