From 34402ae351e71f852a6c2fee7861a66d0dbeb24c Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Thu, 13 Nov 2014 17:54:20 +0200
Subject: [PATCH] Fix XLogReadBufferForRedoExtended to get cleanup lock when
 asked to do so.

---
 src/backend/access/transam/xlogutils.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
index 1a21dac8538..da0e45bfcc6 100644
--- a/src/backend/access/transam/xlogutils.c
+++ b/src/backend/access/transam/xlogutils.c
@@ -312,7 +312,10 @@ XLogReadBufferForRedoExtended(XLogRecPtr lsn, XLogRecord *record,
 		*buf = XLogReadBufferExtended(rnode, forkno, blkno, mode);
 		if (BufferIsValid(*buf))
 		{
-			LockBuffer(*buf, BUFFER_LOCK_EXCLUSIVE);
+			if (get_cleanup_lock)
+				LockBufferForCleanup(*buf);
+			else
+				LockBuffer(*buf, BUFFER_LOCK_EXCLUSIVE);
 			if (lsn <= PageGetLSN(BufferGetPage(*buf)))
 				return BLK_DONE;
 			else