aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2012-01-11 11:00:53 +0200
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2012-01-11 11:01:47 +0200
commit1b9dea04b5cd8b1b2f8041e4aece9d573f007eb1 (patch)
tree66c32029400c0677271419ab1fa005d6d221495f
parent9c808f89c2841dd847555898a8db45fcd69e913b (diff)
downloadpostgresql-1b9dea04b5cd8b1b2f8041e4aece9d573f007eb1.tar.gz
postgresql-1b9dea04b5cd8b1b2f8041e4aece9d573f007eb1.zip
Remove useless 'needlock' argument from GetXLogInsertRecPtr. It was always
passed as 'true'.
-rw-r--r--src/backend/access/transam/xlog.c8
-rw-r--r--src/backend/access/transam/xlogfuncs.c2
-rw-r--r--src/include/access/xlog.h2
3 files changed, 5 insertions, 7 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index db7d9930cb6..19ef66b5f82 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -9411,16 +9411,14 @@ GetStandbyFlushRecPtr(void)
* Get latest WAL insert pointer
*/
XLogRecPtr
-GetXLogInsertRecPtr(bool needlock)
+GetXLogInsertRecPtr(void)
{
XLogCtlInsert *Insert = &XLogCtl->Insert;
XLogRecPtr current_recptr;
- if (needlock)
- LWLockAcquire(WALInsertLock, LW_SHARED);
+ LWLockAcquire(WALInsertLock, LW_SHARED);
INSERT_RECPTR(current_recptr, Insert, Insert->curridx);
- if (needlock)
- LWLockRelease(WALInsertLock);
+ LWLockRelease(WALInsertLock);
return current_recptr;
}
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index 1ca279de3ff..2e10d4d15f7 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -200,7 +200,7 @@ pg_current_xlog_insert_location(PG_FUNCTION_ARGS)
errmsg("recovery is in progress"),
errhint("WAL control functions cannot be executed during recovery.")));
- current_recptr = GetXLogInsertRecPtr(true);
+ current_recptr = GetXLogInsertRecPtr();
snprintf(location, sizeof(location), "%X/%X",
current_recptr.xlogid, current_recptr.xrecoff);
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 93622c4d357..1ddf4bf15f9 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -288,7 +288,7 @@ extern bool XLogInsertAllowed(void);
extern void GetXLogReceiptTime(TimestampTz *rtime, bool *fromStream);
extern XLogRecPtr GetXLogReplayRecPtr(XLogRecPtr *restoreLastRecPtr);
extern XLogRecPtr GetStandbyFlushRecPtr(void);
-extern XLogRecPtr GetXLogInsertRecPtr(bool needlock);
+extern XLogRecPtr GetXLogInsertRecPtr(void);
extern XLogRecPtr GetXLogWriteRecPtr(void);
extern bool RecoveryIsPaused(void);
extern void SetRecoveryPause(bool recoveryPause);