Commit 7288dd2f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

genetlink: use attrs from struct genl_info 



Since dumps carry struct genl_info now, use the attrs pointer
from genl_info and remove the one in struct genl_dumpit_info.

Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20230814214723.2924989-6-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 9272af10

drivers/net/wireguard/netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int wg_get_device_start(struct netlink_callback *cb) 
{

	struct wg_device *wg;



	wg = lookup_interface(genl_dumpit_info(cb)->attrs, cb->skb);

	wg = lookup_interface(genl_info_dump(cb)->attrs, cb->skb);

	if (IS_ERR(wg))

		return PTR_ERR(wg);

	DUMP_CTX(cb)->wg = wg;

include/net/genetlink.h

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ struct genl_split_ops { 
struct genl_dumpit_info {

	const struct genl_family *family;

	struct genl_split_ops op;

	struct nlattr **attrs;

	struct genl_info info;

};

net/devlink/health.c

+2 −2
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static int devlink_nl_health_reporter_get_dump_one(struct sk_buff *msg, 
						   int flags)

{

	struct devlink_nl_dump_state *state = devlink_dump_state(cb);

	const struct genl_dumpit_info *info = genl_dumpit_info(cb);

	const struct genl_info *info = genl_info_dump(cb);

	struct devlink_health_reporter *reporter;

	unsigned long port_index_end = ULONG_MAX;

	struct nlattr **attrs = info->attrs;
@@ -1264,7 +1264,7 @@ int devlink_nl_cmd_health_reporter_diagnose_doit(struct sk_buff *skb, 
static struct devlink_health_reporter *

devlink_health_reporter_get_from_cb(struct netlink_callback *cb)

{

	const struct genl_dumpit_info *info = genl_dumpit_info(cb);

	const struct genl_info *info = genl_info_dump(cb);

	struct devlink_health_reporter *reporter;

	struct nlattr **attrs = info->attrs;

	struct devlink *devlink;

net/devlink/leftover.c

+3 −3
Original line number Diff line number Diff line
@@ -5201,7 +5201,7 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, 
	struct devlink_nl_dump_state *state = devlink_dump_state(cb);

	struct nlattr *chunks_attr, *region_attr, *snapshot_attr;

	u64 ret_offset, start_offset, end_offset = U64_MAX;

	struct nlattr **attrs = info->attrs;

	struct nlattr **attrs = info->info.attrs;

	struct devlink_port *port = NULL;

	devlink_chunk_fill_t *region_cb;

	struct devlink_region *region;
@@ -5224,8 +5224,8 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb, 
		goto out_unlock;

	}



	if (info->attrs[DEVLINK_ATTR_PORT_INDEX]) {

		index = nla_get_u32(info->attrs[DEVLINK_ATTR_PORT_INDEX]);

	if (attrs[DEVLINK_ATTR_PORT_INDEX]) {

		index = nla_get_u32(attrs[DEVLINK_ATTR_PORT_INDEX]);



		port = devlink_port_get_by_index(devlink, index);

		if (!port) {

net/devlink/netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int devlink_nl_inst_iter_dumpit(struct sk_buff *msg, 
int devlink_nl_dumpit(struct sk_buff *msg, struct netlink_callback *cb,

		      devlink_nl_dump_one_func_t *dump_one)

{

	const struct genl_dumpit_info *info = genl_dumpit_info(cb);

	const struct genl_info *info = genl_info_dump(cb);

	struct nlattr **attrs = info->attrs;

	int flags = NLM_F_MULTI;