zebra: Unlock the route node when sending route notifications

When using a context to send route notifications to upper
level protocols, the code was using a locking function to
get the route node.  There is no need for this to be locked
as such FRR should free it up.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 82c6e4fea54eb65e153e6bc45bb718367b0b5132)

diff --git a/zebra/rib.h b/zebra/rib.h
index 01610631279bd9fa6595a3804d3e2abf7b99c2ca..dd22d79835207218ffd31bdea6265860adec930e 100644 (file)
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -483,6 +483,13 @@ extern uint8_t route_distance(int type);
 extern void zebra_rib_evaluate_rn_nexthops(struct route_node *rn, uint32_t seq,
                                           bool rt_delete);
 
+/*
+ * rib_find_rn_from_ctx
+ *
+ * Returns a lock increased route_node for the appropriate
+ * table and prefix specified by the context.  Developer
+ * should unlock the node when done.
+ */
 extern struct route_node *
 rib_find_rn_from_ctx(const struct zebra_dplane_ctx *ctx);
 

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index c0945eae2d57c0ee013a039f94f0428a179b61b0..c84e5a250abda16c2f50788fc163328a4c8ab29a 100644 (file)
--- a/zebra/zapi_msg.c
+++ b/zebra/zapi_msg.c
@@ -812,11 +812,17 @@ int zsend_route_notify_owner(const struct route_node *rn,
 int zsend_route_notify_owner_ctx(const struct zebra_dplane_ctx *ctx,
                                 enum zapi_route_notify_owner note)
 {
-       return (route_notify_internal(
-               rib_find_rn_from_ctx(ctx), dplane_ctx_get_type(ctx),
-               dplane_ctx_get_instance(ctx), dplane_ctx_get_vrf(ctx),
-               dplane_ctx_get_table(ctx), note, dplane_ctx_get_afi(ctx),
-               dplane_ctx_get_safi(ctx)));
+       int result;
+       struct route_node *rn = rib_find_rn_from_ctx(ctx);
+
+       result = route_notify_internal(
+               rn, dplane_ctx_get_type(ctx), dplane_ctx_get_instance(ctx),
+               dplane_ctx_get_vrf(ctx), dplane_ctx_get_table(ctx), note,
+               dplane_ctx_get_afi(ctx), dplane_ctx_get_safi(ctx));
+
+       route_unlock_node(rn);
+
+       return result;
 }
 
 static void zread_route_notify_request(ZAPI_HANDLER_ARGS)