diff options
| author | Emanuele Giuseppe Esposito <eesposit@redhat.com> | 2023-01-13 21:42:00 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-02-01 16:52:32 +0100 |
| commit | 8f4974543203bd1e3a77f198ebb2c60d177b1c40 (patch) | |
| tree | 4b9467e589c14717a3ecf848e862bb8fb13fdd14 /block/nvme.c | |
| parent | 5b317b8dd95fd5a051f5c84f5442c03fc67faae2 (diff) | |
block: Convert bdrv_io_plug() to co_wrapper
BlockDriver->bdrv_io_plug is categorized as IO callback, and it
currently doesn't run in a coroutine. We should let it take a graph
rdlock since the callback traverses the block nodes graph, which however
is only possible in a coroutine.
The only caller of this function is blk_io_plug(), therefore make
blk_io_plug() a co_wrapper, so that we're always running in a coroutine
where the lock can be taken.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20230113204212.359076-3-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/nvme.c')
| -rw-r--r-- | block/nvme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/nvme.c b/block/nvme.c index 1f1367640a..4c32584f07 100644 --- a/block/nvme.c +++ b/block/nvme.c @@ -1567,7 +1567,7 @@ static void nvme_attach_aio_context(BlockDriverState *bs, } } -static void nvme_aio_plug(BlockDriverState *bs) +static void coroutine_fn nvme_co_io_plug(BlockDriverState *bs) { BDRVNVMeState *s = bs->opaque; assert(!s->plugged); @@ -1664,7 +1664,7 @@ static BlockDriver bdrv_nvme = { .bdrv_detach_aio_context = nvme_detach_aio_context, .bdrv_attach_aio_context = nvme_attach_aio_context, - .bdrv_io_plug = nvme_aio_plug, + .bdrv_co_io_plug = nvme_co_io_plug, .bdrv_io_unplug = nvme_aio_unplug, .bdrv_register_buf = nvme_register_buf, |