diff options
| author | Stefan Reiter <s.reiter@proxmox.com> | 2020-04-07 13:56:51 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-04-07 14:34:47 +0200 |
| commit | eca0f3524a4eb57d03a56b0cbcef5527a0981ce4 (patch) | |
| tree | b3c5c453f0789d87f930171ef8b4eff5df0a97e2 /block/backup.c | |
| parent | 08558e33257ec796594bd411261028a93414a70c (diff) | |
backup: don't acquire aio_context in backup_clean
All code-paths leading to backup_clean (via job_clean) have the job's
context already acquired. The job's context is guaranteed to be the same
as the one used by backup_top via backup_job_create.
Since the previous logic effectively acquired the lock twice, this
broke cleanup of backups for disks using IO threads, since the BDRV_POLL_WHILE
in bdrv_backup_top_drop -> bdrv_do_drained_begin would only release the lock
once, thus deadlocking with the IO thread.
This is a partial revert of 0abf2581717a19.
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200407115651.69472-4-s.reiter@proxmox.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/backup.c')
| -rw-r--r-- | block/backup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/block/backup.c b/block/backup.c index 7430ca5883..a7a7dcaf4c 100644 --- a/block/backup.c +++ b/block/backup.c @@ -126,11 +126,7 @@ static void backup_abort(Job *job) static void backup_clean(Job *job) { BackupBlockJob *s = container_of(job, BackupBlockJob, common.job); - AioContext *aio_context = bdrv_get_aio_context(s->backup_top); - - aio_context_acquire(aio_context); bdrv_backup_top_drop(s->backup_top); - aio_context_release(aio_context); } void backup_do_checkpoint(BlockJob *job, Error **errp) |