From 174215826d65f8922a54750252e3c49fe5bb390e Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Wed, 15 Sep 2010 06:51:19 +0000
Subject: [PATCH] Don't call OwnLatch while holding a spinlock. OwnLatch can
 elog() under some "can't happen" scenarios, and spinlocks should only be held
 for a few instructions anyway. As pointed out by Fujii Masao.

---
 src/backend/replication/walsender.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index c477e7c987..9be53eec60 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -28,7 +28,7 @@
  * Portions Copyright (c) 2010-2010, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.31 2010/09/14 13:35:14 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/replication/walsender.c,v 1.32 2010/09/15 06:51:19 heikki Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -511,15 +511,15 @@ InitWalSnd(void)
 		else
 		{
 			/*
-			 * Found a free slot. Take ownership of the latch and initialize
-			 * the other fields.
+			 * Found a free slot. Reserve it for us.
 			 */
-			OwnLatch((Latch *) &walsnd->latch);
 			walsnd->pid = MyProcPid;
 			MemSet(&walsnd->sentPtr, 0, sizeof(XLogRecPtr));
-			/* Set MyWalSnd only after it's fully initialized. */
-			MyWalSnd = (WalSnd *) walsnd;
 			SpinLockRelease(&walsnd->mutex);
+			/* don't need the lock anymore */
+			OwnLatch((Latch *) &walsnd->latch);
+			MyWalSnd = (WalSnd *) walsnd;
+
 			break;
 		}
 	}
-- 
2.11.0