Ignore this patch; I resent the correct version

Darrell

On Wed, May 8, 2019 at 2:36 AM Darrell Ball <dlu...@gmail.com> wrote:

> Fixes: 374fcb5249f1 ("conntrack: Fix race for NAT cleanup.")
> Signed-off-by: Darrell Ball <dlu...@gmail.com>
> ---
>  lib/conntrack.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/conntrack.c b/lib/conntrack.c
> index 0d71195..fe393ba 100644
> --- a/lib/conntrack.c
> +++ b/lib/conntrack.c
> @@ -2558,6 +2558,7 @@ conntrack_dump_done(struct conntrack_dump *dump
> OVS_UNUSED)
>
>  int
>  conntrack_flush(struct conntrack *ct, const uint16_t *zone)
> +    OVS_NO_THREAD_SAFETY_ANALYSIS
>  {
>      for (unsigned i = 0; i < CONNTRACK_BUCKETS; i++) {
>          struct conntrack_bucket *ctb = &ct->buckets[i];
> @@ -2571,7 +2572,7 @@ conntrack_flush(struct conntrack *ct, const uint16_t
> *zone)
>                  }
>              }
>          }
> -        ct_lock_unlock(&ct->buckets[i].lock);
> +        ct_lock_unlock(&ctb->lock);
>          ovs_mutex_unlock(&ctb->cleanup_mutex);
>      }
>
> --
> 1.9.1
>
>
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to