[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/10] colo-compare: check mark in mutual exclusion
From: |
Zhang Chen |
Subject: |
[PATCH 06/10] colo-compare: check mark in mutual exclusion |
Date: |
Wed, 14 Oct 2020 15:25:52 +0800 |
From: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
---
net/colo-compare.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index 86980cef5e..24c366eec0 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -476,13 +476,11 @@ sec:
colo_release_primary_pkt(s, ppkt);
g_queue_push_head(&conn->secondary_list, spkt);
goto pri;
- }
- if (mark == COLO_COMPARE_FREE_SECONDARY) {
+ } else if (mark == COLO_COMPARE_FREE_SECONDARY) {
conn->compare_seq = spkt->seq_end;
packet_destroy(spkt, NULL);
goto sec;
- }
- if (mark == (COLO_COMPARE_FREE_PRIMARY | COLO_COMPARE_FREE_SECONDARY))
{
+ } else if (mark == (COLO_COMPARE_FREE_PRIMARY |
COLO_COMPARE_FREE_SECONDARY)) {
conn->compare_seq = ppkt->seq_end;
colo_release_primary_pkt(s, ppkt);
packet_destroy(spkt, NULL);
--
2.17.1
- [PATCH 00/10] COLO project queued patches 20-Oct, Zhang Chen, 2020/10/14
- [PATCH 01/10] net/filter-rewriter: destroy g_hash_table in colo_rewriter_cleanup, Zhang Chen, 2020/10/14
- [PATCH 02/10] Optimize seq_sorter function for colo-compare, Zhang Chen, 2020/10/14
- [PATCH 03/10] Reduce the time of checkpoint for COLO, Zhang Chen, 2020/10/14
- [PATCH 04/10] Fix the qemu crash when guest shutdown in COLO mode, Zhang Chen, 2020/10/14
- [PATCH 05/10] colo-compare: fix missing compare_seq initialization, Zhang Chen, 2020/10/14
- [PATCH 06/10] colo-compare: check mark in mutual exclusion,
Zhang Chen <=
- [PATCH 07/10] net/colo-compare.c: Fix compare_timeout format issue, Zhang Chen, 2020/10/14
- [PATCH 08/10] net/colo-compare.c: Change the timer clock type, Zhang Chen, 2020/10/14
- [PATCH 09/10] net/colo-compare.c: Add secondary old packet detection, Zhang Chen, 2020/10/14
- Re: [PATCH 00/10] COLO project queued patches 20-Oct, Jason Wang, 2020/10/15