From 058221545f2f62f1449faf69c7a92cb5f1af47cb Mon Sep 17 00:00:00 2001
From: Robert Haas <rhaas@postgresql.org>
Date: Tue, 29 May 2012 15:23:54 -0400
Subject: [PATCH] Use GetAccessMethodMeta.

---
 src/include/access/gin_private.h    | 3 ++-
 src/include/access/hash.h           | 3 ++-
 src/include/access/metapage.h       | 2 +-
 src/include/access/nbtree.h         | 3 ++-
 src/include/access/spgist_private.h | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index e56a92358c..dc4a35ffe7 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -13,6 +13,7 @@
 #include "access/genam.h"
 #include "access/gin.h"
 #include "access/itup.h"
+#include "access/metapage.h"
 #include "fmgr.h"
 #include "storage/bufmgr.h"
 #include "utils/rbtree.h"
@@ -99,7 +100,7 @@ typedef struct GinMetaPageData
 #define GIN_CURRENT_VERSION		1
 
 #define GinPageGetMeta(p) \
-	((GinMetaPageData *) PageGetContents(p))
+	((GinMetaPageData *) GetAccessMethodMeta(p))
 
 /*
  * Macros for accessing a GIN index page's opaque data
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index a3d0f98310..5850ea4b49 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -19,6 +19,7 @@
 
 #include "access/genam.h"
 #include "access/itup.h"
+#include "access/metapage.h"
 #include "access/sdir.h"
 #include "access/xlog.h"
 #include "fmgr.h"
@@ -204,7 +205,7 @@ typedef HashMetaPageData *HashMetaPage;
 	 (MAXALIGN(SizeOfPageHeaderData) + MAXALIGN(sizeof(HashPageOpaqueData))))
 
 #define HashPageGetMeta(page) \
-	((HashMetaPage) PageGetContents(page))
+	((HashMetaPage) GetAccessMethodMeta(page))
 
 /*
  * The number of bits in an ovflpage bitmap word.
diff --git a/src/include/access/metapage.h b/src/include/access/metapage.h
index 721abe23c4..6e50368384 100644
--- a/src/include/access/metapage.h
+++ b/src/include/access/metapage.h
@@ -64,7 +64,7 @@ typedef RelationMetaPageData *RelationMetaPage;
 	(((char *) (page)) + ACCESS_METHOD_META_OFFSET)
 #define GetRelationMeta(page) \
 	(PageIsRelationMetapage((page)) ? BlindGetRelationMeta((page)) : NULL)
-#define GetAccessMethodMeta(page)) \
+#define GetAccessMethodMeta(page) \
 	(PageIsRelationMetapage((page)) ? BlindGetAccessMethodMeta((page)) \
 		: PageGetContents((page)))
 
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index f23ac3559a..c0bcffec22 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -16,6 +16,7 @@
 
 #include "access/genam.h"
 #include "access/itup.h"
+#include "access/metapage.h"
 #include "access/sdir.h"
 #include "access/xlog.h"
 #include "access/xlogutils.h"
@@ -102,7 +103,7 @@ typedef struct BTMetaPageData
 } BTMetaPageData;
 
 #define BTPageGetMeta(p) \
-	((BTMetaPageData *) PageGetContents(p))
+	((BTMetaPageData *) GetAccessMethodMeta(p))
 
 #define BTREE_METAPAGE	0		/* first page is meta */
 #define BTREE_MAGIC		0x053162	/* magic number of btree pages */
diff --git a/src/include/access/spgist_private.h b/src/include/access/spgist_private.h
index 74267a4390..bc068b9579 100644
--- a/src/include/access/spgist_private.h
+++ b/src/include/access/spgist_private.h
@@ -15,6 +15,7 @@
 #define SPGIST_PRIVATE_H
 
 #include "access/itup.h"
+#include "access/metapage.h"
 #include "access/spgist.h"
 #include "nodes/tidbitmap.h"
 #include "utils/rel.h"
@@ -97,7 +98,7 @@ typedef struct SpGistMetaPageData
 #define SPGIST_MAGIC_NUMBER (0xBA0BABEE)
 
 #define SpGistPageGetMeta(p) \
-	((SpGistMetaPageData *) PageGetContents(p))
+	((SpGistMetaPageData *) GetAccessMethodMeta(p))
 
 /*
  * Private state of index AM.  SpGistState is common to both insert and
-- 
2.39.5