From: Andres Freund <andres@anarazel.de>
Date: Wed, 13 Jan 2021 01:16:12 +0000 (-0800)
Subject: fixup! aio: --- BASE PATCH -- (to-be-split).
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Faio;p=users%2Fandresfreund%2Fpostgres.git

fixup! aio: --- BASE PATCH -- (to-be-split).
---

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)
 		{