The original code initializes 'tmp' twice,
which causes duplicate initialization issue.
To fix this, we remove the second initialization
of 'tmp' and use 'parent' directly forsubsequent
operations.
Signed-off-by: Wang Ming <[email protected]>
---
net/tipc/group.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/net/tipc/group.c b/net/tipc/group.c
index 3e137d8c9d2f..b2f964f62c36 100644
--- a/net/tipc/group.c
+++ b/net/tipc/group.c
@@ -284,8 +284,6 @@ static int tipc_group_add_to_tree(struct tipc_group *grp,
n = &grp->members.rb_node;
while (*n) {
tmp = container_of(*n, struct tipc_member, tree_node);
- parent = *n;
- tmp = container_of(parent, struct tipc_member, tree_node);
nkey = (u64)tmp->node << 32 | tmp->port;
if (key < nkey)
n = &(*n)->rb_left;
--
2.25.1
On Thu, 6 Jul 2023 21:42:09 +0800 Wang Ming wrote:
> The original code initializes 'tmp' twice,
> which causes duplicate initialization issue.
> To fix this, we remove the second initialization
> of 'tmp' and use 'parent' directly forsubsequent
> operations.
>
> Signed-off-by: Wang Ming <[email protected]>
Please stop sending the "remove repeated initialization" patches
to networking, thanks.
Le 06/07/2023 à 17:47, Jakub Kicinski a écrit :
> On Thu, 6 Jul 2023 21:42:09 +0800 Wang Ming wrote:
>> The original code initializes 'tmp' twice,
>> which causes duplicate initialization issue.
>> To fix this, we remove the second initialization
>> of 'tmp' and use 'parent' directly forsubsequent
>> operations.
>>
>> Signed-off-by: Wang Ming <[email protected]>
>
> Please stop sending the "remove repeated initialization" patches
> to networking, thanks.
>
>
The patch also looks just bogus, as 'parent' is now always NULL when:
rb_link_node(&m->tree_node, parent, n);
is called after the while loop.
CJ