diff mbox series

[PULL,11/37] blockjob: Fix assertion in block_job_finalize()

Message ID 20180515154033.19899-12-kwolf@redhat.com
State New
Headers show
Series [PULL,01/37] block-backend: simplify blk_get_aio_context | expand

Commit Message

Kevin Wolf May 15, 2018, 3:40 p.m. UTC 
Every job gets a non-NULL job->txn on creation, but it doesn't
necessarily keep it until it is decommissioned: Finalising a job removes
it from its transaction. Therefore, calling 'blockdev-job-finalize' a
second time on an already concluded job causes an assertion failure.

Remove job->txn from the assertion in block_job_finalize() to fix this.
block_job_do_finalize() still has the same assertion, but if a job is
already removed from its transaction, block_job_apply_verb() will
already error out before we run into that assertion.

Cc: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
 blockjob.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/blockjob.c b/blockjob.c
index 0b9b336d19..0ebc5ab178 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -702,7 +702,7 @@  void block_job_complete(BlockJob *job, Error **errp)
 
 void block_job_finalize(BlockJob *job, Error **errp)
 {
-    assert(job && job->id && job->txn);
+    assert(job && job->id);
     if (block_job_apply_verb(job, BLOCK_JOB_VERB_FINALIZE, errp)) {
         return;
     }