Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 1247ea2

Browse files
committed
Remove proc argument from LockCheckConflicts
This has been unused since commit 8563cca. Noted by Antonin Houska
1 parent dd778e9 commit 1247ea2

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/backend/storage/lmgr/lock.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,7 @@ LockAcquireExtended(const LOCKTAG *locktag,
906906
status = STATUS_FOUND;
907907
else
908908
status = LockCheckConflicts(lockMethodTable, lockmode,
909-
lock, proclock, MyProc);
909+
lock, proclock);
910910

911911
if (status == STATUS_OK)
912912
{
@@ -1256,8 +1256,7 @@ int
12561256
LockCheckConflicts(LockMethod lockMethodTable,
12571257
LOCKMODE lockmode,
12581258
LOCK *lock,
1259-
PROCLOCK *proclock,
1260-
PGPROC *proc)
1259+
PROCLOCK *proclock)
12611260
{
12621261
int numLockModes = lockMethodTable->numLockModes;
12631262
LOCKMASK myLocks;

src/backend/storage/lmgr/proc.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -997,8 +997,7 @@ ProcSleep(LOCALLOCK *locallock, LockMethod lockMethodTable)
997997
LockCheckConflicts(lockMethodTable,
998998
lockmode,
999999
lock,
1000-
proclock,
1001-
MyProc) == STATUS_OK)
1000+
proclock) == STATUS_OK)
10021001
{
10031002
/* Skip the wait and just grant myself the lock. */
10041003
GrantLock(lock, proclock, lockmode);
@@ -1384,8 +1383,7 @@ ProcLockWakeup(LockMethod lockMethodTable, LOCK *lock)
13841383
LockCheckConflicts(lockMethodTable,
13851384
lockmode,
13861385
lock,
1387-
proc->waitProcLock,
1388-
proc) == STATUS_OK)
1386+
proc->waitProcLock) == STATUS_OK)
13891387
{
13901388
/* OK to waken */
13911389
GrantLock(lock, proc->waitProcLock, lockmode);

src/include/storage/lock.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ extern void AtPrepare_Locks(void);
503503
extern void PostPrepare_Locks(TransactionId xid);
504504
extern int LockCheckConflicts(LockMethod lockMethodTable,
505505
LOCKMODE lockmode,
506-
LOCK *lock, PROCLOCK *proclock, PGPROC *proc);
506+
LOCK *lock, PROCLOCK *proclock);
507507
extern void GrantLock(LOCK *lock, PROCLOCK *proclock, LOCKMODE lockmode);
508508
extern void GrantAwaitedLock(void);
509509
extern void RemoveFromWaitQueue(PGPROC *proc, uint32 hashcode);

0 commit comments

Comments
 (0)