[svn-r18702] Description:

	Bring r18672 from metadata journaling "merging" branch to trunk:

	Mostly changes to move to only using one 'user data' parameter for
calls to H5AC_protect(), along with some minor reformatting code cleanups.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.6.3 (amazon) in debug mode
        Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

1 files changed, 9 insertions, 6 deletions

diff --git a/src/H5EApkg.h b/src/H5EApkg.h
index f9e0c93..f0cb080 100644
--- a/src/H5EApkg.h
+++ b/src/H5EApkg.h
@@ -306,21 +306,24 @@ struct H5EA_t {
 /* Metadata cache callback user data types */
 
 /* Info needed for loading data block page */
-typedef struct H5EA_dblk_page_load_ud_t {
+typedef struct H5EA_dblk_page_cache_ud_t {
+    H5EA_hdr_t    *hdr;         /* Shared extensible array information */
     H5EA_sblock_t *parent;      /* Pointer to parent object for data block page (super block) */
-} H5EA_dblk_page_load_ud_t;
+} H5EA_dblk_page_cache_ud_t;
 
 /* Info needed for loading data block */
-typedef struct H5EA_dblock_load_ud_t {
+typedef struct H5EA_dblock_cache_ud_t {
+    H5EA_hdr_t    *hdr;         /* Shared extensible array information */
     void *parent;               /* Pointer to parent object for data block (index or super block) */
     size_t nelmts;              /* Number of elements in data block */
-} H5EA_dblock_load_ud_t;
+} H5EA_dblock_cache_ud_t;
 
 /* Info needed for loading super block */
-typedef struct H5EA_sblock_load_ud_t {
+typedef struct H5EA_sblock_cache_ud_t {
+    H5EA_hdr_t    *hdr;         /* Shared extensible array information */
     H5EA_iblock_t *parent;      /* Pointer to parent object for super block (index block) */
     unsigned sblk_idx;          /* Index of super block */
-} H5EA_sblock_load_ud_t;
+} H5EA_sblock_cache_ud_t;
 
 #ifdef H5EA_TESTING
 typedef struct H5EA__ctx_cb_t {