From: Kevin Wolf <kwolf@redhat.com>
Date: Wed, 12 Sep 2018 11:50:38 +0000 (+0200)
Subject: job: Fix missing locking due to mismerge
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1756c780b7879fb64e41135feac781d84a1f995;p=qemu.git

job: Fix missing locking due to mismerge

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>
---

diff --git a/job.c b/job.c
index 3dd31a5f8e..d17b1c82da 100644
--- a/job.c
+++ b/job.c
@@ -847,7 +847,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);
 }
 
 /**