From 6ca7cd89a2d1998b16e8168dda62d43a9e0fdaff Mon Sep 17 00:00:00 2001 From: Peter Geoghegan Date: Mon, 20 Jul 2020 16:03:38 -0700 Subject: [PATCH] Assert that buffer is pinned in LockBuffer(). Strengthen the LockBuffer() assertion that verifies BufferIsValid() by making it verify BufferIsPinned() instead. Do the same in nearby related functions. There is probably not much chance that anybody will try to lock a buffer that is not already pinned, but we might as well make sure of that. --- src/backend/storage/buffer/bufmgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 83d91b14fb..9b9303ff65 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -3743,7 +3743,7 @@ LockBuffer(Buffer buffer, int mode) { BufferDesc *buf; - Assert(BufferIsValid(buffer)); + Assert(BufferIsPinned(buffer)); if (BufferIsLocal(buffer)) return; /* local buffers need no lock */ @@ -3769,7 +3769,7 @@ ConditionalLockBuffer(Buffer buffer) { BufferDesc *buf; - Assert(BufferIsValid(buffer)); + Assert(BufferIsPinned(buffer)); if (BufferIsLocal(buffer)) return true; /* act as though we got it */ @@ -3801,7 +3801,7 @@ LockBufferForCleanup(Buffer buffer) BufferDesc *bufHdr; char *new_status = NULL; - Assert(BufferIsValid(buffer)); + Assert(BufferIsPinned(buffer)); Assert(PinCountWaitBuf == NULL); if (BufferIsLocal(buffer)) -- 2.11.4.GIT