On 2/16/23 20:04, Mark Michelson wrote:
> The "local_datapths" typo is still present in this version of the patch.
> However, since that's the only thing holding it back,
>
> Acked-by: Mark Michelson <[email protected]>
>
> I think whoever commits this can correct the typo.
>
Thanks, Mark and Ales! I applied it with the following minor changes:
diff --git a/controller/local_data.c b/controller/local_data.c
index abd372172b..acaf1de6d0 100644
--- a/controller/local_data.c
+++ b/controller/local_data.c
@@ -652,8 +652,7 @@ lb_is_local(const struct sbrec_load_balancer *sbrec_lb,
{
/* Check if the lb is local or not. It is enough to find one datapath
* in "local_datapaths" to consider the LB to be local. */
- size_t i;
- for (i = 0; i < sbrec_lb->n_datapaths; i++) {
+ for (size_t i = 0; i < sbrec_lb->n_datapaths; i++) {
if (get_local_datapath(local_datapaths,
sbrec_lb->datapaths[i]->tunnel_key)) {
return true;
@@ -662,7 +661,7 @@ lb_is_local(const struct sbrec_load_balancer *sbrec_lb,
struct sbrec_logical_dp_group *dp_group = sbrec_lb->datapath_group;
- for (i = 0; dp_group && i < dp_group->n_datapaths; i++) {
+ for (size_t i = 0; dp_group && i < dp_group->n_datapaths; i++) {
if (get_local_datapath(local_datapaths,
dp_group->datapaths[i]->tunnel_key)) {
return true;
diff --git a/controller/ovn-controller.c b/controller/ovn-controller.c
index d96f16cc2a..805fb1b3cc 100644
--- a/controller/ovn-controller.c
+++ b/controller/ovn-controller.c
@@ -2687,7 +2687,7 @@ struct ed_type_lb_data {
struct lb_data_ctx_in {
const struct sbrec_load_balancer_table *lb_table;
- const struct hmap *local_datapths;
+ const struct hmap *local_datapaths;
const struct smap *template_vars;
};
@@ -2766,7 +2766,7 @@ lb_data_handle_changed_ref(enum objdep_type type, const
char *res_name,
const struct sbrec_load_balancer *sbrec_lb =
sbrec_load_balancer_table_get_for_uuid(ctx_in->lb_table, uuid);
- if (!lb_is_local(sbrec_lb, ctx_in->local_datapths)) {
+ if (!lb_is_local(sbrec_lb, ctx_in->local_datapaths)) {
free(resource_lb_uuid);
continue;
}
@@ -2886,7 +2886,7 @@ lb_data_template_var_handler(struct engine_node *node,
void *data)
const struct lb_data_ctx_in ctx_in = {
.lb_table = lb_table,
- .local_datapths = &rt_data->local_datapaths,
+ .local_datapaths = &rt_data->local_datapaths,
.template_vars = &tv_data->local_templates
};
---
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
