diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2013-09-16 22:14:14 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2013-09-16 22:14:14 -0300 |
| commit | 1247ea28cbc834bd6750b569537baff4e35edf79 (patch) | |
| tree | 269f1de99ede142eafa7ee8710d3b4632261df15 /src/backend | |
| parent | dd778e9d888454fdd2c25c66fc268ba9844eb125 (diff) | |
| download | postgresql-1247ea28cbc834bd6750b569537baff4e35edf79.tar.gz postgresql-1247ea28cbc834bd6750b569537baff4e35edf79.zip | |
Remove `proc` argument from LockCheckConflicts
This has been unused since commit 8563ccae2caf.
Noted by Antonin Houska
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/storage/lmgr/lock.c | 5 | ||||
| -rw-r--r-- | src/backend/storage/lmgr/proc.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c index 273c7223027..f4f32e946bd 100644 --- a/src/backend/storage/lmgr/lock.c +++ b/src/backend/storage/lmgr/lock.c @@ -906,7 +906,7 @@ LockAcquireExtended(const LOCKTAG *locktag, status = STATUS_FOUND; else status = LockCheckConflicts(lockMethodTable, lockmode, - lock, proclock, MyProc); + lock, proclock); if (status == STATUS_OK) { @@ -1256,8 +1256,7 @@ int LockCheckConflicts(LockMethod lockMethodTable, LOCKMODE lockmode, LOCK *lock, - PROCLOCK *proclock, - PGPROC *proc) + PROCLOCK *proclock) { int numLockModes = lockMethodTable->numLockModes; LOCKMASK myLocks; diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c index 25bd5285669..222251df659 100644 --- a/src/backend/storage/lmgr/proc.c +++ b/src/backend/storage/lmgr/proc.c @@ -997,8 +997,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable) LockCheckConflicts(lockMethodTable, lockmode, lock, - proclock, - MyProc) == STATUS_OK) + proclock) == STATUS_OK) { /* Skip the wait and just grant myself the lock. */ GrantLock(lock, proclock, lockmode); @@ -1384,8 +1383,7 @@ ProcLockWakeup(LockMethod lockMethodTable, LOCK *lock) LockCheckConflicts(lockMethodTable, lockmode, lock, - proc->waitProcLock, - proc) == STATUS_OK) + proc->waitProcLock) == STATUS_OK) { /* OK to waken */ GrantLock(lock, proc->waitProcLock, lockmode); |