56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
|
From f842ac5501037ccea54e3b6c8a7a2471b30aaea7 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Date: Wed, 10 Oct 2018 20:21:55 +0100
|
||
|
|
Subject: [PATCH 29/49] job: Fix missing locking due to mismerge
|
||
|
|
|
||
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Message-id: <20181010202213.7372-17-kwolf@redhat.com>
|
||
|
|
Patchwork-id: 82607
|
||
|
|
O-Subject: [RHEL-8 qemu-kvm PATCH 26/44] job: Fix missing locking due to mismerge
|
||
|
|
Bugzilla: 1637976
|
||
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
||
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
|
||
|
|
job_completed() had a problem with double locking that was recently
|
||
|
|
fixed independently by two different commits:
|
||
|
|
|
||
|
|
"job: Fix nested aio_poll() hanging in job_txn_apply"
|
||
|
|
"jobs: add exit shim"
|
||
|
|
|
||
|
|
One fix removed the first aio_context_acquire(), the other fix removed
|
||
|
|
the other one. Now we have a bug again and the code is run without any
|
||
|
|
locking.
|
||
|
|
|
||
|
|
Add it back in one of the places.
|
||
|
|
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
Reviewed-by: John Snow <jsnow@redhat.com>
|
||
|
|
(cherry picked from commit d1756c780b7879fb64e41135feac781d84a1f995)
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
job.c | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/job.c b/job.c
|
||
|
|
index 5d117fb..db53163 100644
|
||
|
|
--- a/job.c
|
||
|
|
+++ b/job.c
|
||
|
|
@@ -842,7 +842,11 @@ static void job_completed(Job *job)
|
||
|
|
static void job_exit(void *opaque)
|
||
|
|
{
|
||
|
|
Job *job = (Job *)opaque;
|
||
|
|
+ AioContext *ctx = job->aio_context;
|
||
|
|
+
|
||
|
|
+ aio_context_acquire(ctx);
|
||
|
|
job_completed(job);
|
||
|
|
+ aio_context_release(ctx);
|
||
|
|
}
|
||
|
|
|
||
|
|
/**
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|