Commit 78ade619 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

genetlink: use .start callback for dumppolicy 



The structure of ctrl_dumppolicy() is clearly split into
init and dumping. Move the init to a .start callback
for clarity, it's a more idiomatic netlink dump code structure.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent adc84845

net/netlink/genetlink.c

+24 −24
Original line number Diff line number Diff line
@@ -1107,19 +1107,16 @@ struct ctrl_dump_policy_ctx { 
	u16 fam_id;

};



static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb)

static int ctrl_dumppolicy_start(struct netlink_callback *cb)

{

	struct ctrl_dump_policy_ctx *ctx = (void *)cb->ctx;

	struct nlattr *tb[CTRL_ATTR_MAX + 1];

	const struct genl_family *rt;

	int err;



	BUILD_BUG_ON(sizeof(*ctx) > sizeof(cb->ctx));



	if (!ctx->fam_id) {

		struct nlattr *tb[CTRL_ATTR_MAX + 1];



		err = genlmsg_parse(cb->nlh, &genl_ctrl, tb,

				    genl_ctrl.maxattr,

	err = genlmsg_parse(cb->nlh, &genl_ctrl, tb, genl_ctrl.maxattr,

			    genl_ctrl.policy, cb->extack);

	if (err)

		return err;
@@ -1136,7 +1133,6 @@ static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb) 
			return -ENOENT;

		ctx->fam_id = rt->id;

	}

	}



	rt = genl_family_find_byid(ctx->fam_id);

	if (!rt)
@@ -1145,9 +1141,12 @@ static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb) 
	if (!rt->policy)

		return -ENODATA;



	err = netlink_policy_dump_start(rt->policy, rt->maxattr, &ctx->state);

	if (err)

		return err;

	return netlink_policy_dump_start(rt->policy, rt->maxattr, &ctx->state);

}



static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb)

{

	struct ctrl_dump_policy_ctx *ctx = (void *)cb->ctx;



	while (netlink_policy_dump_loop(ctx->state)) {

		void *hdr;
@@ -1159,7 +1158,7 @@ static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb) 
		if (!hdr)

			goto nla_put_failure;



		if (nla_put_u16(skb, CTRL_ATTR_FAMILY_ID, rt->id))

		if (nla_put_u16(skb, CTRL_ATTR_FAMILY_ID, ctx->fam_id))

			goto nla_put_failure;



		nest = nla_nest_start(skb, CTRL_ATTR_POLICY);
@@ -1199,6 +1198,7 @@ static const struct genl_ops genl_ctrl_ops[] = { 
	},

	{

		.cmd		= CTRL_CMD_GETPOLICY,

		.start		= ctrl_dumppolicy_start,

		.dumpit		= ctrl_dumppolicy,

		.done		= ctrl_dumppolicy_done,

	},