| Message ID | 20180509162637.15575-2-kwolf@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/09/2018 11:25 AM, Kevin Wolf wrote: > 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> > --- > blockjob.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Reviewed-by: Eric Blake <eblake@redhat.com> > diff --git a/blockjob.c b/blockjob.c > index 4de48166b2..b38ed7e265 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; > } >
On 2018-05-09 18:25, Kevin Wolf wrote: > 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. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> > --- > blockjob.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Max Reitz <mreitz@redhat.com>
On 05/09/2018 12:25 PM, Kevin Wolf wrote: > 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. > > Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> > --- > blockjob.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/blockjob.c b/blockjob.c > index 4de48166b2..b38ed7e265 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; > } > Oh, ack. Good catch.
diff --git a/blockjob.c b/blockjob.c index 4de48166b2..b38ed7e265 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; }
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. Signed-off-by: Kevin Wolf <kwolf@redhat.com> --- blockjob.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)