motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-25 11:01:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

job: Fix missing locking due to mismerge

Browse source 
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>
This commit is contained in:
Kevin Wolf 2018-09-12 13:50:38 +02:00
parent 49880165a4
commit d1756c780b
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
job.c
View file

@ -847,7 +847,11 @@ static void job_completed(Job *job)
static void job_exit(void *opaque) static void job_exit(void *opaque)
{ {
Job *job = (Job *)opaque; Job *job = (Job *)opaque;
AioContext *ctx = job->aio_context;
aio_context_acquire(ctx);
job_completed(job); job_completed(job);
aio_context_release(ctx);
} }
/** /**