Message ID | 20240130155814.268622-1-jiri@resnulli.us (mailing list archive) |
---|---|
State | Accepted |
Commit | e7f8df0e81bf73ab6dc6ac1dc01273fa06564119 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] dpll: move xa_erase() call in to match dpll_pin_alloc() error path order | expand |
On 30/01/2024 15:58, Jiri Pirko wrote: > From: Jiri Pirko <jiri@nvidia.com> > > This is cosmetics. Move the call of xa_erase() in dpll_pin_put() > so the order of cleanup calls matches the error path of > dpll_pin_alloc(). Jiri, remind me please, why do we clean up xarray in error path in the same order we allocate them? The patch looks good, Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> > > Signed-off-by: Jiri Pirko <jiri@nvidia.com> > --- > drivers/dpll/dpll_core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/dpll/dpll_core.c b/drivers/dpll/dpll_core.c > index 5152bd1b0daf..61e5c607a72f 100644 > --- a/drivers/dpll/dpll_core.c > +++ b/drivers/dpll/dpll_core.c > @@ -560,9 +560,9 @@ void dpll_pin_put(struct dpll_pin *pin) > { > mutex_lock(&dpll_lock); > if (refcount_dec_and_test(&pin->refcount)) { > + xa_erase(&dpll_pin_xa, pin->id); > xa_destroy(&pin->dpll_refs); > xa_destroy(&pin->parent_refs); > - xa_erase(&dpll_pin_xa, pin->id); > dpll_pin_prop_free(&pin->prop); > kfree(pin); > }
Tue, Jan 30, 2024 at 10:14:49PM CET, vadim.fedorenko@linux.dev wrote: >On 30/01/2024 15:58, Jiri Pirko wrote: >> From: Jiri Pirko <jiri@nvidia.com> >> >> This is cosmetics. Move the call of xa_erase() in dpll_pin_put() >> so the order of cleanup calls matches the error path of >> dpll_pin_alloc(). > >Jiri, remind me please, why do we clean up xarray in error path in the >same order we allocate them? Yeah, that calls for another cosmetics patch :) Feel free to send it. > >The patch looks good, > >Reviewed-by: Vadim Fedorenko <vadim.fedorenko@linux.dev> > >> >> Signed-off-by: Jiri Pirko <jiri@nvidia.com> >> --- >> drivers/dpll/dpll_core.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/dpll/dpll_core.c b/drivers/dpll/dpll_core.c >> index 5152bd1b0daf..61e5c607a72f 100644 >> --- a/drivers/dpll/dpll_core.c >> +++ b/drivers/dpll/dpll_core.c >> @@ -560,9 +560,9 @@ void dpll_pin_put(struct dpll_pin *pin) >> { >> mutex_lock(&dpll_lock); >> if (refcount_dec_and_test(&pin->refcount)) { >> + xa_erase(&dpll_pin_xa, pin->id); >> xa_destroy(&pin->dpll_refs); >> xa_destroy(&pin->parent_refs); >> - xa_erase(&dpll_pin_xa, pin->id); >> dpll_pin_prop_free(&pin->prop); >> kfree(pin); >> } >
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 30 Jan 2024 16:58:14 +0100 you wrote: > From: Jiri Pirko <jiri@nvidia.com> > > This is cosmetics. Move the call of xa_erase() in dpll_pin_put() > so the order of cleanup calls matches the error path of > dpll_pin_alloc(). > > Signed-off-by: Jiri Pirko <jiri@nvidia.com> > > [...] Here is the summary with links: - [net-next] dpll: move xa_erase() call in to match dpll_pin_alloc() error path order https://git.kernel.org/netdev/net-next/c/e7f8df0e81bf You are awesome, thank you!
diff --git a/drivers/dpll/dpll_core.c b/drivers/dpll/dpll_core.c index 5152bd1b0daf..61e5c607a72f 100644 --- a/drivers/dpll/dpll_core.c +++ b/drivers/dpll/dpll_core.c @@ -560,9 +560,9 @@ void dpll_pin_put(struct dpll_pin *pin) { mutex_lock(&dpll_lock); if (refcount_dec_and_test(&pin->refcount)) { + xa_erase(&dpll_pin_xa, pin->id); xa_destroy(&pin->dpll_refs); xa_destroy(&pin->parent_refs); - xa_erase(&dpll_pin_xa, pin->id); dpll_pin_prop_free(&pin->prop); kfree(pin); }