Commit 563fe939 authored by Breno Leitao's avatar Breno Leitao Committed by David S. Miller
Browse files

netconsole: Helper to count number of used entries 



Add a helper function nr_extradata_entries() to count the number of used
extradata entries in a netconsole target. This refactors the duplicate
code for counting entries into a single function, which will be reused
by upcoming CPU sysdata changes.

The helper uses list_count_nodes() to count the number of children in
the userdata group configfs hierarchy.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4205f649

drivers/net/netconsole.c

+11 −3
Original line number Diff line number Diff line
@@ -662,6 +662,16 @@ static ssize_t remote_ip_store(struct config_item *item, const char *buf, 
	return ret;

}



/* Count number of entries we have in extradata.

 * This is important because the extradata_complete only supports

 * MAX_EXTRADATA_ITEMS entries. Before enabling any new {user,sys}data

 * feature, number of entries needs to checked for available space.

 */

static size_t count_extradata_entries(struct netconsole_target *nt)

{

	return list_count_nodes(&nt->userdata_group.cg_children);

}



static ssize_t remote_mac_store(struct config_item *item, const char *buf,

		size_t count)

{
@@ -811,15 +821,13 @@ static struct config_item *userdatum_make_item(struct config_group *group, 
	struct netconsole_target *nt;

	struct userdatum *udm;

	struct userdata *ud;

	size_t child_count;



	if (strlen(name) > MAX_EXTRADATA_NAME_LEN)

		return ERR_PTR(-ENAMETOOLONG);



	ud = to_userdata(&group->cg_item);

	nt = userdata_to_target(ud);

	child_count = list_count_nodes(&nt->userdata_group.cg_children);

	if (child_count >= MAX_EXTRADATA_ITEMS)

	if (count_extradata_entries(nt) >= MAX_EXTRADATA_ITEMS)

		return ERR_PTR(-ENOSPC);



	udm = kzalloc(sizeof(*udm), GFP_KERNEL);