devlink: remove some unnecessary code
Subsystems (4)
PATCH 1/1 devlink: remove some unnecessary code
This code checks if (attrs[DEVLINK_ATTR_TRAP_POLICER_ID]) twice. Once at the start of the function and then a couple lines later. Delete the second check since that one must be true.
Because the second condition is always true, it means the:
policer_item = group_item->policer_item;
assignment is immediately over-written. Delete that as well.
---
This is from static analysis and not tested. It's possible (although unlikely) that the static checker found buggy code instead of merely a bit of dead code. Please review this one carefully.
net/devlink/leftover.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
net/devlink/leftover.c +6 -11
@@ -8719,6 +8719,7 @@ static int devlink_trap_group_set(struct devlink *devlink,struct netlink_ext_ack *extack = info->extack;const struct devlink_trap_policer *policer;struct nlattr **attrs = info->attrs; +u32 policer_id;int err;if (!attrs[DEVLINK_ATTR_TRAP_POLICER_ID ])
@@ -8727,17 +8728,11 @@ static int devlink_trap_group_set(struct devlink *devlink,if (!devlink->ops->trap_group_set)return -EOPNOTSUPP ; - policer_item = group_item->policer_item; -if (attrs[DEVLINK_ATTR_TRAP_POLICER_ID ]) { -u32 policer_id; - - policer_id =nla_get_u32 (attrs[DEVLINK_ATTR_TRAP_POLICER_ID ]); - policer_item =devlink_trap_policer_item_lookup (devlink, - policer_id); -if (policer_id && !policer_item) { -NL_SET_ERR_MSG_MOD (extack,"Device did not register this trap policer" ); -return -ENOENT ; - } + policer_id =nla_get_u32 (attrs[DEVLINK_ATTR_TRAP_POLICER_ID ]); + policer_item =devlink_trap_policer_item_lookup (devlink, policer_id); +if (policer_id && !policer_item) { +NL_SET_ERR_MSG_MOD (extack,"Device did not register this trap policer" ); +return -ENOENT ; } policer = policer_item ? policer_item->policer :NULL ;
Signature · 1 line
2.35.1
Quoted 11 lines · Fri, Jan 13, 2023 at 08:35:43AM CET, [email protected] wrote:
This code checks if (attrs[DEVLINK_ATTR_TRAP_POLICER_ID]) twice. Once at the start of the function and then a couple lines later. Delete the second check since that one must be true.
Because the second condition is always true, it means the:
policer_item = group_item->policer_item;assignment is immediately over-written. Delete that as well.
Signed-off-by Dan Carpenter <[email protected]>
Quoted 11 lines · On Fri, 13 Jan 2023 10:35:43 +0300 Dan Carpenter wrote:
This code checks if (attrs[DEVLINK_ATTR_TRAP_POLICER_ID]) twice. Once at the start of the function and then a couple lines later. Delete the second check since that one must be true.
Because the second condition is always true, it means the:
policer_item = group_item->policer_item;assignment is immediately over-written. Delete that as well.
Signed-off-by Dan Carpenter <[email protected]>
Quoted 11 lines · Dan Carpenter
This code checks if (attrs[DEVLINK_ATTR_TRAP_POLICER_ID]) twice. Once at the start of the function and then a couple lines later. Delete the second check since that one must be true.
Because the second condition is always true, it means the:
policer_item = group_item->policer_item;assignment is immediately over-written. Delete that as well.
Signed-off-by Dan Carpenter <[email protected]>
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Fri, 13 Jan 2023 10:35:43 +0300 you wrote:
This code checks if (attrs[DEVLINK_ATTR_TRAP_POLICER_ID]) twice. Once at the start of the function and then a couple lines later. Delete the second check since that one must be true.
Because the second condition is always true, it means the:
policer_item = group_item->policer_item;[...]
Here is the summary with links:
- [net-next] devlink: remove some unnecessary code
https://git.kernel.org/netdev/net-next/c/501543b4fff0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html