From: Stefan Hajnoczi <[email protected]> Reduce the level of indentation to make further code changes easier to read.
Signed-off-by: Stefan Hajnoczi <[email protected]> Message-ID: <[email protected]> Reviewed-by: Kevin Wolf <[email protected]> Signed-off-by: Kevin Wolf <[email protected]> --- util/fdmon-io_uring.c | 54 ++++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/util/fdmon-io_uring.c b/util/fdmon-io_uring.c index bcfdddf398..6ee6adbebb 100644 --- a/util/fdmon-io_uring.c +++ b/util/fdmon-io_uring.c @@ -397,33 +397,35 @@ bool fdmon_io_uring_setup(AioContext *ctx, Error **errp) void fdmon_io_uring_destroy(AioContext *ctx) { - if (ctx->fdmon_ops == &fdmon_io_uring_ops) { - AioHandler *node; - - io_uring_queue_exit(&ctx->fdmon_io_uring); - - /* Move handlers due to be removed onto the deleted list */ - while ((node = QSLIST_FIRST_RCU(&ctx->submit_list))) { - unsigned flags = qatomic_fetch_and(&node->flags, - ~(FDMON_IO_URING_PENDING | - FDMON_IO_URING_ADD | - FDMON_IO_URING_REMOVE | - FDMON_IO_URING_DELETE_AIO_HANDLER)); - - if ((flags & FDMON_IO_URING_REMOVE) || - (flags & FDMON_IO_URING_DELETE_AIO_HANDLER)) { - QLIST_INSERT_HEAD_RCU(&ctx->deleted_aio_handlers, - node, node_deleted); - } - - QSLIST_REMOVE_HEAD_RCU(&ctx->submit_list, node_submitted); - } + AioHandler *node; + + if (ctx->fdmon_ops != &fdmon_io_uring_ops) { + return; + } + + io_uring_queue_exit(&ctx->fdmon_io_uring); - g_source_remove_unix_fd(&ctx->source, ctx->io_uring_fd_tag); - ctx->io_uring_fd_tag = NULL; + /* Move handlers due to be removed onto the deleted list */ + while ((node = QSLIST_FIRST_RCU(&ctx->submit_list))) { + unsigned flags = qatomic_fetch_and(&node->flags, + ~(FDMON_IO_URING_PENDING | + FDMON_IO_URING_ADD | + FDMON_IO_URING_REMOVE | + FDMON_IO_URING_DELETE_AIO_HANDLER)); - qemu_lockcnt_lock(&ctx->list_lock); - fdmon_poll_downgrade(ctx); - qemu_lockcnt_unlock(&ctx->list_lock); + if ((flags & FDMON_IO_URING_REMOVE) || + (flags & FDMON_IO_URING_DELETE_AIO_HANDLER)) { + QLIST_INSERT_HEAD_RCU(&ctx->deleted_aio_handlers, + node, node_deleted); + } + + QSLIST_REMOVE_HEAD_RCU(&ctx->submit_list, node_submitted); } + + g_source_remove_unix_fd(&ctx->source, ctx->io_uring_fd_tag); + ctx->io_uring_fd_tag = NULL; + + qemu_lockcnt_lock(&ctx->list_lock); + fdmon_poll_downgrade(ctx); + qemu_lockcnt_unlock(&ctx->list_lock); } -- 2.51.1
