Both functions are only called by Job->run() callbacks, therefore they must take the lock in the *_run() implementation.
Signed-off-by: Emanuele Giuseppe Esposito <eespo...@redhat.com> --- block/amend.c | 1 + block/create.c | 1 + include/block/block_int-common.h | 2 ++ 3 files changed, 4 insertions(+) diff --git a/block/amend.c b/block/amend.c index f696a006e3..a155b6889b 100644 --- a/block/amend.c +++ b/block/amend.c @@ -45,6 +45,7 @@ static int coroutine_fn blockdev_amend_run(Job *job, Error **errp) { BlockdevAmendJob *s = container_of(job, BlockdevAmendJob, common); int ret; + GRAPH_RDLOCK_GUARD(); job_progress_set_remaining(&s->common, 1); ret = s->bs->drv->bdrv_co_amend(s->bs, s->opts, s->force, errp); diff --git a/block/create.c b/block/create.c index 4df43f11f4..4048d71265 100644 --- a/block/create.c +++ b/block/create.c @@ -43,6 +43,7 @@ static int coroutine_fn blockdev_create_run(Job *job, Error **errp) int ret; GLOBAL_STATE_CODE(); + GRAPH_RDLOCK_GUARD(); job_progress_set_remaining(&s->common, 1); ret = s->drv->bdrv_co_create(s->opts, errp); diff --git a/include/block/block_int-common.h b/include/block/block_int-common.h index d45961a1d1..1e9bb91c98 100644 --- a/include/block/block_int-common.h +++ b/include/block/block_int-common.h @@ -251,6 +251,7 @@ struct BlockDriver { Error **errp); void (*bdrv_close)(BlockDriverState *bs); + /* Called with graph rdlock taken */ int coroutine_fn (*bdrv_co_create)(BlockdevCreateOptions *opts, Error **errp); /* Called with graph rdlock taken */ @@ -471,6 +472,7 @@ struct BlockDriver { int (*bdrv_probe)(const uint8_t *buf, int buf_size, const char *filename); + /* Called with graph rdlock taken. */ int coroutine_fn (*bdrv_co_amend)(BlockDriverState *bs, BlockdevAmendOptions *opts, bool force, -- 2.31.1