Message ID | 20230808082020.1363497-1-jiri@resnulli.us (mailing list archive) |
---|---|
State | Accepted |
Commit | 832140804e3b3ad19d73adebd25f69ed98778c58 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net-next] devlink: clear flag on port register error path | expand |
On Tue, Aug 08, 2023 at 10:20:20AM +0200, Jiri Pirko wrote: > From: Jiri Pirko <jiri@nvidia.com> > > When xarray insertion fails, clear the flag. > > Fixes: 47b438cc2725 ("net: devlink: convert port_list into xarray") > Signed-off-by: Jiri Pirko <jiri@nvidia.com> Reviewed-by: Simon Horman <horms@kernel.org>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 8 Aug 2023 10:20:20 +0200 you wrote: > From: Jiri Pirko <jiri@nvidia.com> > > When xarray insertion fails, clear the flag. > > Fixes: 47b438cc2725 ("net: devlink: convert port_list into xarray") > Signed-off-by: Jiri Pirko <jiri@nvidia.com> > > [...] Here is the summary with links: - [net-next] devlink: clear flag on port register error path https://git.kernel.org/netdev/net-next/c/832140804e3b You are awesome, thank you!
diff --git a/net/devlink/leftover.c b/net/devlink/leftover.c index 0a9b49dfeb61..5568992a1a90 100644 --- a/net/devlink/leftover.c +++ b/net/devlink/leftover.c @@ -6840,8 +6840,10 @@ int devl_port_register_with_ops(struct devlink *devlink, spin_lock_init(&devlink_port->type_lock); INIT_LIST_HEAD(&devlink_port->reporter_list); err = xa_insert(&devlink->ports, port_index, devlink_port, GFP_KERNEL); - if (err) + if (err) { + devlink_port->registered = false; return err; + } INIT_DELAYED_WORK(&devlink_port->type_warn_dw, &devlink_port_type_warn); devlink_port_type_warn_schedule(devlink_port);