Do not call LWLockRelease() in MtmDeepUnlock() when MtmLockCount == 0

kelvich · kelvich · commit 247bce7f93e1 · 2017-11-13T02:21:37.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -388,25 +388,27 @@ void MtmUnlock(void)
 		Assert(Mtm->lastLockHolder == MyProcPid);
 		return;
 	}
-	if (MyProc == NULL) { /* If we have no PGPROC, then lock was not obtained. */
-		return;
-	}
+
 	Mtm->lastLockHolder = 0;
-	LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);
+
+	/* If we have no PGPROC, then lock was not obtained. */
+	if (MyProc != NULL)
+		LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);
 }
 
 void MtmDeepUnlock(void)
 {
-	if (MtmLockCount > 0)
-		Assert(Mtm->lastLockHolder == MyProcPid);
-
-	/* If we have no PGPROC, then lock was not obtained. */
-	if (MyProc == NULL)
+	if (MtmLockCount == 0)
 		return;
 
+	Assert(Mtm->lastLockHolder == MyProcPid);
+
 	MtmLockCount = 0;
 	Mtm->lastLockHolder = 0;
-	LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);
+
+	/* If we have no PGPROC, then lock was not obtained. */
+	if (MyProc != NULL)
+		LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);
 }
 
 void MtmLockNode(int nodeId, LWLockMode mode)
