drholy/linux-bredos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devlink: drop the filter argument from devlinks_xa_find_get

Browse Source 
Looks like devlinks_xa_find_get() was intended to get the mark
from the @filter argument. It doesn't actually use @filter, passing
DEVLINK_REGISTERED to xa_find_fn() directly. Walking marks other
than registered is unlikely so drop @filter argument completely.

Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2023-01-04 20:05:24 -08:00
parent 20615659b5
commit 8861c0933c
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
net/devlink/core.c
View File

@@ -92,7 +92,7 @@ void devlink_put(struct devlink *devlink)
} }
static struct devlink * static struct devlink *
devlinks_xa_find_get(struct net *net, unsigned long *indexp, xa_mark_t filter, devlinks_xa_find_get(struct net *net, unsigned long *indexp,
void * (*xa_find_fn)(struct xarray *, unsigned long *, void * (*xa_find_fn)(struct xarray *, unsigned long *,
unsigned long, xa_mark_t)) unsigned long, xa_mark_t))
{ {
@@ -125,17 +125,15 @@ unlock:
} }
struct devlink * struct devlink *
devlinks_xa_find_get_first(struct net *net, unsigned long *indexp, devlinks_xa_find_get_first(struct net *net, unsigned long *indexp)
xa_mark_t filter)
{ {
return devlinks_xa_find_get(net, indexp, filter, xa_find); return devlinks_xa_find_get(net, indexp, xa_find);
} }
struct devlink * struct devlink *
devlinks_xa_find_get_next(struct net *net, unsigned long *indexp, devlinks_xa_find_get_next(struct net *net, unsigned long *indexp)
xa_mark_t filter)
{ {
return devlinks_xa_find_get(net, indexp, filter, xa_find_after); return devlinks_xa_find_get(net, indexp, xa_find_after);
} }
/** /**

15
net/devlink/devl_internal.h
View File

@@ -81,20 +81,15 @@ extern struct genl_family devlink_nl_family;
* devlink_put() needs to be called for each iterated devlink pointer * devlink_put() needs to be called for each iterated devlink pointer
* in loop body in order to release the reference. * in loop body in order to release the reference.
*/ */
#define devlinks_xa_for_each_get(net, index, devlink, filter) \
for (index = 0, \
devlink = devlinks_xa_find_get_first(net, &index, filter); \
devlink; devlink = devlinks_xa_find_get_next(net, &index, filter))
#define devlinks_xa_for_each_registered_get(net, index, devlink) \ #define devlinks_xa_for_each_registered_get(net, index, devlink) \
devlinks_xa_for_each_get(net, index, devlink, DEVLINK_REGISTERED) for (index = 0, \
devlink = devlinks_xa_find_get_first(net, &index); \
devlink; devlink = devlinks_xa_find_get_next(net, &index))
struct devlink * struct devlink *
devlinks_xa_find_get_first(struct net *net, unsigned long *indexp, devlinks_xa_find_get_first(struct net *net, unsigned long *indexp);
xa_mark_t filter);
struct devlink * struct devlink *
devlinks_xa_find_get_next(struct net *net, unsigned long *indexp, devlinks_xa_find_get_next(struct net *net, unsigned long *indexp);
xa_mark_t filter);
/* Netlink */ /* Netlink */
#define DEVLINK_NL_FLAG_NEED_PORT BIT(0) #define DEVLINK_NL_FLAG_NEED_PORT BIT(0)