From 8164102ffe02dfc6478c0b3f8ffce29705a9a53b Mon Sep 17 00:00:00 2001 From: Vladimir Sementsov-Ogievskiy Date: Thu, 6 Jun 2019 18:41:31 +0300 Subject: [PATCH] blockdev: blockdev_mark_auto_del: drop usage of bs->job We are going to remove bs->job pointer. Drop it's usage in blockdev_mark_auto_del: instead of looking at bs->job let's check all jobs for references to bs. Suggested-by: Kevin Wolf Signed-off-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Kevin Wolf --- blockdev.c | 17 ++++++++--------- blockjob.c | 14 ++++++++++++++ include/block/blockjob.h | 9 +++++++++ 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/blockdev.c b/blockdev.c index b5c0fd3c49..a9dd73eafc 100644 --- a/blockdev.c +++ b/blockdev.c @@ -140,22 +140,21 @@ void override_max_devs(BlockInterfaceType type, int max_devs) void blockdev_mark_auto_del(BlockBackend *blk) { DriveInfo *dinfo = blk_legacy_dinfo(blk); - BlockDriverState *bs = blk_bs(blk); - AioContext *aio_context; + BlockJob *job; if (!dinfo) { return; } - if (bs) { - aio_context = bdrv_get_aio_context(bs); - aio_context_acquire(aio_context); + for (job = block_job_next(NULL); job; job = block_job_next(job)) { + if (block_job_has_bdrv(job, blk_bs(blk))) { + AioContext *aio_context = job->job.aio_context; + aio_context_acquire(aio_context); - if (bs->job) { - job_cancel(&bs->job->job, false); - } + job_cancel(&job->job, false); - aio_context_release(aio_context); + aio_context_release(aio_context); + } } dinfo->auto_del = 1; diff --git a/blockjob.c b/blockjob.c index 1fac6bb8a7..c3620ec544 100644 --- a/blockjob.c +++ b/blockjob.c @@ -198,6 +198,20 @@ void block_job_remove_all_bdrv(BlockJob *job) job->nodes = NULL; } +bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs) +{ + GSList *el; + + for (el = job->nodes; el; el = el->next) { + BdrvChild *c = el->data; + if (c->bs == bs) { + return true; + } + } + + return false; +} + int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs, uint64_t perm, uint64_t shared_perm, Error **errp) { diff --git a/include/block/blockjob.h b/include/block/blockjob.h index ede0bd8dcb..35faa3aa26 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -122,6 +122,15 @@ int block_job_add_bdrv(BlockJob *job, const char *name, BlockDriverState *bs, void block_job_remove_all_bdrv(BlockJob *job); /** + * block_job_has_bdrv: + * @job: The block job + * + * Searches for @bs in the list of nodes that are involved in the + * job. + */ +bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs); + +/** * block_job_set_speed: * @job: The job to set the speed for. * @speed: The new value -- 2.11.0