Commit 337ad364 authored by Jiri Pirko's avatar Jiri Pirko Committed by Paolo Abeni
Browse files

devlink: use devl_is_registered() helper instead xa_get_mark() 



Instead of checking the xarray mark directly using xa_get_mark() helper
use devl_is_registered() helper which wraps it up. Note that there are
couple more users of xa_get_mark() left which are going to be handled
by the next patch.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent f7dd48ea

net/devlink/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static void devlink_notify(struct devlink *devlink, enum devlink_command cmd) 
	int err;



	WARN_ON(cmd != DEVLINK_CMD_NEW && cmd != DEVLINK_CMD_DEL);

	WARN_ON(!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED));

	WARN_ON(!devl_is_registered(devlink));



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

	if (!msg)
@@ -999,7 +999,7 @@ static void __devlink_flash_update_notify(struct devlink *devlink, 
		cmd != DEVLINK_CMD_FLASH_UPDATE_END &&

		cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS);



	if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))

	if (!devl_is_registered(devlink))

		return;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

net/devlink/rate.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static void devlink_rate_notify(struct devlink_rate *devlink_rate, 


	WARN_ON(cmd != DEVLINK_CMD_RATE_NEW && cmd != DEVLINK_CMD_RATE_DEL);



	if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))

	if (!devl_is_registered(devlink))

		return;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);

net/devlink/trap.c

+6 −3
Original line number Diff line number Diff line
@@ -1173,7 +1173,8 @@ devlink_trap_group_notify(struct devlink *devlink, 


	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_GROUP_NEW &&

		     cmd != DEVLINK_CMD_TRAP_GROUP_DEL);

	if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))



	if (!devl_is_registered(devlink))

		return;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1234,7 +1235,8 @@ static void devlink_trap_notify(struct devlink *devlink, 


	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_NEW &&

		     cmd != DEVLINK_CMD_TRAP_DEL);

	if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))



	if (!devl_is_registered(devlink))

		return;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1710,7 +1712,8 @@ devlink_trap_policer_notify(struct devlink *devlink, 


	WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &&

		     cmd != DEVLINK_CMD_TRAP_POLICER_DEL);

	if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))



	if (!devl_is_registered(devlink))

		return;



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);