Am 14.06.2019 um 11:28 hat Zhang Chen geschrieben: > From: Zhang Chen <chen.zh...@intel.com> > > No block job on active disk after failover. > In the replication_stop() function have canceled the block job, > we check it again here. > > Signed-off-by: Zhang Chen <chen.zh...@intel.com> > --- > block/replication.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/block/replication.c b/block/replication.c > index 3d4dedddfc..bdf2bf4bbc 100644 > --- a/block/replication.c > +++ b/block/replication.c > @@ -146,7 +146,9 @@ static void replication_close(BlockDriverState *bs) > replication_stop(s->rs, false, NULL); > } > if (s->stage == BLOCK_REPLICATION_FAILOVER) { > - job_cancel_sync(&s->active_disk->bs->job->job); > + if (s->secondary_disk->bs->job) { > + job_cancel_sync(&s->secondary_disk->bs->job->job); > + }
Why are you changing the code from active_disk to secondary_disk? Also, please rebase on top of Vladimir's '[PATCH 0/4] block: drop bs->job'. Kevin