Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zebra: unlock if_table route_nodes #16882

Merged
merged 1 commit into from
Sep 23, 2024
Merged

zebra: unlock if_table route_nodes #16882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions zebra/if_netlink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1799,14 +1799,18 @@ int netlink_tunneldump_read(struct zebra_ns *zns)

ret = netlink_request_tunneldump(zns, PF_BRIDGE,
tmp_if->ifindex);
if (ret < 0)
if (ret < 0) {
route_unlock_node(rn);
return ret;
}

ret = netlink_parse_info(netlink_link_change, netlink_cmd,
&dp_info, 0, true);

if (ret < 0)
if (ret < 0) {
route_unlock_node(rn);
return ret;
}
}

return 0;
Expand Down
3 changes: 3 additions & 0 deletions zebra/zebra_evpn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,7 @@ static int zebra_evpn_map_vlan_ns(struct ns *ns,
vni_id = zebra_vxlan_if_access_vlan_vni_find(zif, br_if);
if (vni_id) {
found = 1;
route_unlock_node(rn);
break;
}
}
Expand Down Expand Up @@ -757,6 +758,7 @@ static int zebra_evpn_from_svi_ns(struct ns *ns,
zebra_vxlan_if_access_vlan_vni_find(zif, br_if);
if (vni_id) {
found = 1;
route_unlock_node(rn);
break;
}
}
Expand Down Expand Up @@ -842,6 +844,7 @@ static int zvni_map_to_macvlan_ns(struct ns *ns, void *_in_param, void **_p_ifp)

if (zif->link == in_param->svi_if) {
*p_ifp = tmp_if;
route_unlock_node(rn);
return NS_WALK_STOP;
}
}
Expand Down
Loading