]> git.proxmox.com Git - mirror_qemu.git/commit
job: Fix missing locking due to mismerge
authorKevin Wolf <kwolf@redhat.com>
Wed, 12 Sep 2018 11:50:38 +0000 (13:50 +0200)
committerKevin Wolf <kwolf@redhat.com>
Tue, 25 Sep 2018 13:50:15 +0000 (15:50 +0200)
commitd1756c780b7879fb64e41135feac781d84a1f995
tree56ed165e51777fa0e1bddc296ee98f52e70de1d1
parent49880165a44f26dc84651858750facdee31f2513
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>
job.c