From 157c83210fa3f7233daae3c0a3525c3baef2009c Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Tue, 12 Jan 2021 17:16:12 -0800 Subject: [PATCH] fixup! aio: --- BASE PATCH -- (to-be-split). --- src/backend/storage/ipc/aio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/backend/storage/ipc/aio.c b/src/backend/storage/ipc/aio.c index b63184dd5e..76c6e7894f 100644 --- a/src/backend/storage/ipc/aio.c +++ b/src/backend/storage/ipc/aio.c @@ -139,14 +139,14 @@ struct PgAioInProgress /* PgAioAction, indexes PgAioCompletionCallbacks */ PgAioAction type; + /* which AIO ring is this entry active for */ + uint8 ring; + PgAioIPFlags flags; bool user_referenced; bool system_referenced; - /* which AIO ring is this entry active for */ - uint8 ring; - /* index into allProcs, or PG_UINT32_MAX for process local IO */ uint32 owner_id; @@ -1019,6 +1019,7 @@ pgaio_uncombine_one(PgAioInProgress *io) Assert(!(cur->flags & PGAIOIP_SHARED_CALLBACK_CALLED)); Assert(cur->merge_with || cur != io); + Assert(cur->type == io->type); switch (cur->type) { -- 2.39.5