Commit247bce7

committed

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

1 parent5876bfd commit247bce7Copy full SHA for 247bce7

File tree

+12

-10

lines changed

+12

-10

lines changed

Lines changed: 12 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -388,25 +388,27 @@ void MtmUnlock(void)`
`388`	`388`	`Assert(Mtm->lastLockHolder==MyProcPid);`
`389`	`389`	`return;`
`390`	`390`	`}`
`391`		`-if (MyProc==NULL) {/* If we have no PGPROC, then lock was not obtained. */`
`392`		`-return;`
`393`		`-}`
	`391`	`+`
`394`	`392`	`Mtm->lastLockHolder=0;`
`395`		`-LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
	`393`	`+`
	`394`	`+/* If we have no PGPROC, then lock was not obtained. */`
	`395`	`+if (MyProc!=NULL)`
	`396`	`+LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
`396`	`397`	`}`
`397`	`398`
`398`	`399`	`voidMtmDeepUnlock(void)`
`399`	`400`	`{`
`400`		`-if (MtmLockCount>0)`
`401`		`-Assert(Mtm->lastLockHolder==MyProcPid);`
`402`		`-`
`403`		`-/* If we have no PGPROC, then lock was not obtained. */`
`404`		`-if (MyProc==NULL)`
	`401`	`+if (MtmLockCount==0)`
`405`	`402`	`return;`
`406`	`403`
	`404`	`+Assert(Mtm->lastLockHolder==MyProcPid);`
	`405`	`+`
`407`	`406`	`MtmLockCount=0;`
`408`	`407`	`Mtm->lastLockHolder=0;`
`409`		`-LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
	`408`	`+`
	`409`	`+/* If we have no PGPROC, then lock was not obtained. */`
	`410`	`+if (MyProc!=NULL)`
	`411`	`+LWLockRelease((LWLockId)&Mtm->locks[MTM_STATE_LOCK_ID]);`
`410`	`412`	`}`
`411`	`413`
`412`	`414`	`voidMtmLockNode(intnodeId,LWLockModemode)`

Comments

(0)