Remove `proc` argument from LockCheckConflicts

This has been unused since commit 8563ccae2caf.

Noted by Antonin Houska

diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 273c72230274b46ba6a46bb8b295ef5375aaa36d..f4f32e946bd53ace27e2c088eee2dcf11cf95bec 100644 (file)
--- 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 25bd5285669ded1e2b194b29d2fc327bbda51c7a..222251df6599dfbe84aa83bf18e11803798c721c 100644 (file)
--- 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);

diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 9642a19821e21cb10decd0dca700238661083998..7bcaf7cfcaed693f79064244b82cf1894ce2ece9 100644 (file)
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -503,7 +503,7 @@ extern void AtPrepare_Locks(void);
 extern void PostPrepare_Locks(TransactionId xid);
 extern int LockCheckConflicts(LockMethod lockMethodTable,
                                   LOCKMODE lockmode,
-                                  LOCK *lock, PROCLOCK *proclock, PGPROC *proc);
+                                  LOCK *lock, PROCLOCK *proclock);
 extern void GrantLock(LOCK *lock, PROCLOCK *proclock, LOCKMODE lockmode);
 extern void GrantAwaitedLock(void);
 extern void RemoveFromWaitQueue(PGPROC *proc, uint32 hashcode);