Merge pull request #6267 from mjstapp/fix_ospf6_unlock_sa

ospf6d: fix SA warnings
This commit is contained in:
Quentin Young 2020-04-21 14:31:56 -04:00 committed by GitHub
commit 64fbc17e51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -136,7 +136,7 @@ void ospf6_lsdb_add(struct ospf6_lsa *lsa, struct ospf6_lsdb *lsdb)
} }
/* to free the lookup lock in node get*/ /* to free the lookup lock in node get*/
route_unlock_node(current); route_unlock_node(current);
old = ospf6_lsa_unlock(old); ospf6_lsa_unlock(old);
} }
ospf6_lsdb_count_assert(lsdb); ospf6_lsdb_count_assert(lsdb);
@ -164,7 +164,7 @@ void ospf6_lsdb_remove(struct ospf6_lsa *lsa, struct ospf6_lsdb *lsdb)
route_unlock_node(node); /* to free the lookup lock */ route_unlock_node(node); /* to free the lookup lock */
route_unlock_node(node); /* to free the original lock */ route_unlock_node(node); /* to free the original lock */
lsa = ospf6_lsa_unlock(lsa); ospf6_lsa_unlock(lsa);
ospf6_lsdb_count_assert(lsdb); ospf6_lsdb_count_assert(lsdb);
} }
@ -279,7 +279,7 @@ struct ospf6_lsa *ospf6_lsdb_next(const struct route_node *iterend,
{ {
struct route_node *node = lsa->rn; struct route_node *node = lsa->rn;
lsa = ospf6_lsa_unlock(lsa); ospf6_lsa_unlock(lsa);
do do
node = route_next_until(node, iterend); node = route_next_until(node, iterend);
@ -316,7 +316,7 @@ void ospf6_lsdb_lsa_unlock(struct ospf6_lsa *lsa)
if (lsa != NULL) { if (lsa != NULL) {
if (lsa->rn != NULL) if (lsa->rn != NULL)
route_unlock_node(lsa->rn); route_unlock_node(lsa->rn);
lsa = ospf6_lsa_unlock(lsa); ospf6_lsa_unlock(lsa);
} }
} }