| Message ID | 1557309093-114154-1-git-send-email-dlu998@gmail.com |
|---|---|
| State | Accepted |
| Commit | c9a2e714eef5a7c28aa2c279a4599cd6c10b148e |
| Headers | show |
| Series | [ovs-dev,branch-2.9] conntrack: Fix clang warning. | expand |
On 08.05.2019 12:51, Darrell Ball wrote: > Reported-by: Ilya Maximets <i.maximets@samsung.com> > Fixes: 374fcb5249f1 ("conntrack: Fix race for NAT cleanup.") > Signed-off-by: Darrell Ball <dlu998@gmail.com> > --- > lib/conntrack.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/lib/conntrack.c b/lib/conntrack.c > index 0d71195..077bdca 100644 > --- a/lib/conntrack.c > +++ b/lib/conntrack.c > @@ -2571,7 +2571,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); > } Thanks. This fixes TravisCI build. I updated the commit hash in 'Fixes' tag, because there is no such object '374fcb5249f1' in git, and pushed to branch-2.9. Best regards, Ilya Maximets.
Bleep bloop. Greetings Darrell Ball, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. git-am: fatal: sha1 information is lacking or useless (lib/conntrack.c). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 conntrack: Fix clang warning. The copy of the patch that failed is found in: /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/.git/rebase-apply/patch When you have resolved this problem, run "git am --resolved". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Please check this out. If you feel there has been an error, please email aconole@bytheb.org Thanks, 0-day Robot
diff --git a/lib/conntrack.c b/lib/conntrack.c index 0d71195..077bdca 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -2571,7 +2571,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); }
Reported-by: Ilya Maximets <i.maximets@samsung.com> Fixes: 374fcb5249f1 ("conntrack: Fix race for NAT cleanup.") Signed-off-by: Darrell Ball <dlu998@gmail.com> --- lib/conntrack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)