diff options
| author | Emanuele Giuseppe Esposito <eesposit@redhat.com> | 2023-01-13 21:42:01 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-02-01 16:52:32 +0100 |
| commit | 09d9fc97f8b0bf30f3c55a5ae3a20f799fd3e5f2 (patch) | |
| tree | eb670ff964eaccb9bf8556c943f89d17e731c74d /block/file-posix.c | |
| parent | 8f4974543203bd1e3a77f198ebb2c60d177b1c40 (diff) | |
block: Convert bdrv_io_unplug() to co_wrapper
BlockDriver->bdrv_io_unplug 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_unplug(), therefore make
blk_io_unplug() 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-4-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/file-posix.c')
| -rw-r--r-- | block/file-posix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/file-posix.c b/block/file-posix.c index 6a5f8d6747..3b112095a4 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -2149,7 +2149,7 @@ static void coroutine_fn raw_co_io_plug(BlockDriverState *bs) #endif } -static void raw_aio_unplug(BlockDriverState *bs) +static void coroutine_fn raw_co_io_unplug(BlockDriverState *bs) { BDRVRawState __attribute__((unused)) *s = bs->opaque; #ifdef CONFIG_LINUX_AIO @@ -3318,7 +3318,7 @@ BlockDriver bdrv_file = { .bdrv_co_copy_range_to = raw_co_copy_range_to, .bdrv_refresh_limits = raw_refresh_limits, .bdrv_co_io_plug = raw_co_io_plug, - .bdrv_io_unplug = raw_aio_unplug, + .bdrv_co_io_unplug = raw_co_io_unplug, .bdrv_attach_aio_context = raw_aio_attach_aio_context, .bdrv_co_truncate = raw_co_truncate, @@ -3690,7 +3690,7 @@ static BlockDriver bdrv_host_device = { .bdrv_co_copy_range_to = raw_co_copy_range_to, .bdrv_refresh_limits = raw_refresh_limits, .bdrv_co_io_plug = raw_co_io_plug, - .bdrv_io_unplug = raw_aio_unplug, + .bdrv_co_io_unplug = raw_co_io_unplug, .bdrv_attach_aio_context = raw_aio_attach_aio_context, .bdrv_co_truncate = raw_co_truncate, @@ -3814,7 +3814,7 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_co_flush_to_disk = raw_co_flush_to_disk, .bdrv_refresh_limits = raw_refresh_limits, .bdrv_co_io_plug = raw_co_io_plug, - .bdrv_io_unplug = raw_aio_unplug, + .bdrv_co_io_unplug = raw_co_io_unplug, .bdrv_attach_aio_context = raw_aio_attach_aio_context, .bdrv_co_truncate = raw_co_truncate, @@ -3944,7 +3944,7 @@ static BlockDriver bdrv_host_cdrom = { .bdrv_co_flush_to_disk = raw_co_flush_to_disk, .bdrv_refresh_limits = raw_refresh_limits, .bdrv_co_io_plug = raw_co_io_plug, - .bdrv_io_unplug = raw_aio_unplug, + .bdrv_co_io_unplug = raw_co_io_unplug, .bdrv_attach_aio_context = raw_aio_attach_aio_context, .bdrv_co_truncate = raw_co_truncate, |