diff options
Diffstat (limited to 'src/backend/storage/lmgr/proc.c')
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 48d18e54781..0ac70da1f0a 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.198 2008/01/01 19:45:52 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/storage/lmgr/proc.c,v 1.199 2008/01/26 19:55:08 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -486,20 +486,18 @@ HaveNFreeProcs(int n) /* * Cancel any pending wait for lock, when aborting a transaction. * - * Returns true if we had been waiting for a lock, else false. - * * (Normally, this would only happen if we accept a cancel/die * interrupt while waiting; but an ereport(ERROR) while waiting is * within the realm of possibility, too.) */ -bool +void LockWaitCancel(void) { LWLockId partitionLock; /* Nothing to do if we weren't waiting for a lock */ if (lockAwaited == NULL) - return false; + return; /* Turn off the deadlock timer, if it's still running (see ProcSleep) */ disable_sig_alarm(false); @@ -538,12 +536,6 @@ LockWaitCancel(void) * wakeup signal isn't harmful, and it seems not worth expending cycles to * get rid of a signal that most likely isn't there. */ - - /* - * Return true even if we were kicked off the lock before we were able to - * remove ourselves. - */ - return true; } |