[svn-r16634] Description:

	Bring r16618:16633 back from trunk to revise_chunks branch.

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/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) 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-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.6 (amazon) in debug mode
        Mac OS X/32 10.5.6 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

3 files changed, 99 insertions, 52 deletions

diff --git a/test/cache.c b/test/cache.c
index c3e5ee0..bacd559 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -2727,7 +2727,7 @@ check_insert_entry(void)
 
 	result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
 			              &in_cache, &is_dirty, &is_protected,
-				      &is_pinned);
+				      &is_pinned, NULL, NULL);
 
         if ( result < 0 ) {
 
@@ -13541,7 +13541,7 @@ check_get_entry_status(void)
          */
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                &in_cache, &is_dirty, &is_protected, &is_pinned);
+                &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13565,7 +13565,7 @@ check_get_entry_status(void)
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                &in_cache, &is_dirty, &is_protected, &is_pinned);
+                &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13587,7 +13587,7 @@ check_get_entry_status(void)
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                &in_cache, &is_dirty, &is_protected, &is_pinned);
+                &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13609,7 +13609,7 @@ check_get_entry_status(void)
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                &in_cache, &is_dirty, &is_protected, &is_pinned);
+                &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13631,7 +13631,7 @@ check_get_entry_status(void)
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                &in_cache, &is_dirty, &is_protected, &is_pinned);
+                &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13653,7 +13653,7 @@ check_get_entry_status(void)
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                &in_cache, &is_dirty, &is_protected, &is_pinned);
+                &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13743,7 +13743,7 @@ check_expunge_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned);
+				      &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13781,7 +13781,7 @@ check_expunge_entry(void)
     if ( pass ) {
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                &in_cache, &is_dirty, &is_protected, &is_pinned);
+                &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13821,7 +13821,7 @@ check_expunge_entry(void)
          */
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
-                &in_cache, &is_dirty, &is_protected, &is_pinned);
+                &in_cache, &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13863,7 +13863,7 @@ check_expunge_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned);
+				      &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13902,7 +13902,7 @@ check_expunge_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned);
+				      &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -13943,7 +13943,7 @@ check_expunge_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned);
+				      &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -14878,7 +14878,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -14948,7 +14948,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15021,7 +15021,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15086,7 +15086,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15147,7 +15147,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15184,7 +15184,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned);
+				      &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15290,7 +15290,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15362,7 +15362,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15435,7 +15435,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15502,7 +15502,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15563,7 +15563,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
 			              &reported_entry_size, &in_cache,
-				      &is_dirty, &is_protected, &is_pinned);
+				      &is_dirty, &is_protected, &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15600,7 +15600,7 @@ check_resize_entry(void)
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr, &entry_size,
                                       &in_cache, &is_dirty, &is_protected,
-				      &is_pinned);
+				      &is_pinned, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15878,7 +15878,7 @@ check_evictions_enabled(void)
         entry_ptr = &(base_addr[0]);
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL);
+			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -15941,7 +15941,7 @@ check_evictions_enabled(void)
         entry_ptr = &(base_addr[1]);
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL);
+			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -16148,7 +16148,7 @@ check_evictions_enabled(void)
         entry_ptr = &(base_addr[2]);
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL);
+			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -16184,7 +16184,7 @@ check_evictions_enabled(void)
         entry_ptr = &(base_addr[3]);
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL);
+			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -16313,7 +16313,7 @@ check_evictions_enabled(void)
         entry_ptr = &(base_addr[4]);
 
         result = H5C_get_entry_status(cache_ptr, entry_ptr->addr,
-			              NULL, &in_cache, NULL, NULL, NULL);
+			              NULL, &in_cache, NULL, NULL, NULL, NULL, NULL);
 
 	if ( result < 0 ) {
 
@@ -29726,6 +29726,7 @@ static unsigned
 check_flush_deps(void)
 {
     H5C_t * cache_ptr = NULL;           /* Metadata cache for this test */
+    test_entry_t *base_addr;            /* Base address of entries for test */
     int entry_type = PICO_ENTRY_TYPE;   /* Use very small entry size (size of entries doesn't matter) */
     size_t entry_size = PICO_ENTRY_SIZE; /* 1 byte */
     unsigned u;                         /* Local index variable */
@@ -29750,6 +29751,7 @@ check_flush_deps(void)
 
     reset_entries();
     cache_ptr = setup_cache((size_t)(2 * 1024), (size_t)(1 * 1024));
+    base_addr = entries[entry_type];
 
     if ( !pass ) CACHE_ERROR("setup_cache failed")
 
@@ -29776,12 +29778,47 @@ check_flush_deps(void)
 
     /* Create flush dependency between entries 0 (child) & 1 (parent) */
     {
+        hbool_t in_cache, is_flush_dep_parent, is_flush_dep_child;
+        test_entry_t * entry_ptr;
+
         protect_entry(cache_ptr, entry_type, 1);
         if ( !pass ) CACHE_ERROR("protect_entry failed")
         
+        /* Check the parent's entry status */
+	entry_ptr = &(base_addr[1]);
+	if(H5C_get_entry_status(cache_ptr, entry_ptr->addr, NULL, &in_cache,
+                NULL, NULL, NULL, &is_flush_dep_parent, &is_flush_dep_child) < 0)
+            CACHE_ERROR("H5C_get_entry_status() failed")
+        if(!in_cache || is_flush_dep_parent || is_flush_dep_child)
+            CACHE_ERROR("invalid entry status")
+
+        /* Check the child's entry status */
+	entry_ptr = &(base_addr[0]);
+	if(H5C_get_entry_status(cache_ptr, entry_ptr->addr, NULL, &in_cache,
+                NULL, NULL, NULL, &is_flush_dep_parent, &is_flush_dep_child) < 0)
+            CACHE_ERROR("H5C_get_entry_status() failed")
+        if(!in_cache || is_flush_dep_parent || is_flush_dep_child)
+            CACHE_ERROR("invalid entry status")
+
         create_flush_dependency(cache_ptr, entry_type, 1, entry_type, 0);
         if ( !pass ) CACHE_ERROR("create_flush_dependency failed")
 
+        /* Check the parent's entry status */
+	entry_ptr = &(base_addr[1]);
+	if(H5C_get_entry_status(cache_ptr, entry_ptr->addr, NULL, &in_cache,
+                NULL, NULL, NULL, &is_flush_dep_parent, &is_flush_dep_child) < 0)
+            CACHE_ERROR("H5C_get_entry_status() failed")
+        if(!in_cache || !is_flush_dep_parent || is_flush_dep_child)
+            CACHE_ERROR("invalid entry status")
+
+        /* Check the child's entry status */
+	entry_ptr = &(base_addr[0]);
+	if(H5C_get_entry_status(cache_ptr, entry_ptr->addr, NULL, &in_cache,
+                NULL, NULL, NULL, &is_flush_dep_parent, &is_flush_dep_child) < 0)
+            CACHE_ERROR("H5C_get_entry_status() failed")
+        if(!in_cache || is_flush_dep_parent || !is_flush_dep_child)
+            CACHE_ERROR("invalid entry status")
+
         /* Change expected values, and verify the status of the entries 
          * after creating flush dependency
          */
diff --git a/test/cache_common.c b/test/cache_common.c
index c0ec7c8..6a9c7e5 100644
--- a/test/cache_common.c
+++ b/test/cache_common.c
@@ -155,6 +155,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)pico_flush,
     (H5C_dest_func_t)pico_dest,
     (H5C_clear_func_t)pico_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)pico_size
   },
   {
@@ -163,6 +164,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)nano_flush,
     (H5C_dest_func_t)nano_dest,
     (H5C_clear_func_t)nano_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)nano_size
   },
   {
@@ -171,6 +173,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)micro_flush,
     (H5C_dest_func_t)micro_dest,
     (H5C_clear_func_t)micro_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)micro_size
   },
   {
@@ -179,6 +182,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)tiny_flush,
     (H5C_dest_func_t)tiny_dest,
     (H5C_clear_func_t)tiny_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)tiny_size
   },
   {
@@ -187,6 +191,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)small_flush,
     (H5C_dest_func_t)small_dest,
     (H5C_clear_func_t)small_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)small_size
   },
   {
@@ -195,6 +200,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)medium_flush,
     (H5C_dest_func_t)medium_dest,
     (H5C_clear_func_t)medium_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)medium_size
   },
   {
@@ -203,6 +209,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)large_flush,
     (H5C_dest_func_t)large_dest,
     (H5C_clear_func_t)large_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)large_size
   },
   {
@@ -211,6 +218,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)huge_flush,
     (H5C_dest_func_t)huge_dest,
     (H5C_clear_func_t)huge_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)huge_size
   },
   {
@@ -219,6 +227,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)monster_flush,
     (H5C_dest_func_t)monster_dest,
     (H5C_clear_func_t)monster_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)monster_size
   },
   {
@@ -227,6 +236,7 @@ const H5C_class_t types[NUMBER_OF_ENTRY_TYPES] =
     (H5C_flush_func_t)variable_flush,
     (H5C_dest_func_t)variable_dest,
     (H5C_clear_func_t)variable_clear,
+    (H5C_notify_func_t)NULL,
     (H5C_size_func_t)variable_size
   }
 };
diff --git a/test/earray.c b/test/earray.c
index 7b68e95..cccb5a0 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -312,51 +312,51 @@ check_stats(const H5EA_t *ea, const earray_state_t *state)
         FAIL_STACK_ERROR
 
     /* Compare information */
-    if(earray_stats.max_idx_set != state->max_idx_set) {
-        HDfprintf(stdout, "earray_stats.max_idx_set = %Hu, state->max_idx_set = %Hu\n", earray_stats.max_idx_set, state->max_idx_set);
+    if(earray_stats.stored.max_idx_set != state->max_idx_set) {
+        HDfprintf(stdout, "earray_stats.stored.max_idx_set = %Hu, state->max_idx_set = %Hu\n", earray_stats.stored.max_idx_set, state->max_idx_set);
         TEST_ERROR
     } /* end if */
-    if(earray_stats.nelmts != state->nelmts) {
-        HDfprintf(stdout, "earray_stats.nelmts = %Hu, state->nelmts = %Hu\n", earray_stats.nelmts, state->nelmts);
+    if(earray_stats.stored.nelmts != state->nelmts) {
+        HDfprintf(stdout, "earray_stats.stored.nelmts = %Hu, state->nelmts = %Hu\n", earray_stats.stored.nelmts, state->nelmts);
         TEST_ERROR
     } /* end if */
-    if(earray_stats.hdr_size != state->hdr_size) {
-        HDfprintf(stdout, "earray_stats.hdr_size = %Hu, state->hdr_size = %Hu\n", earray_stats.hdr_size, state->hdr_size);
+    if(earray_stats.computed.hdr_size != state->hdr_size) {
+        HDfprintf(stdout, "earray_stats.computed.hdr_size = %Hu, state->hdr_size = %Hu\n", earray_stats.computed.hdr_size, state->hdr_size);
         TEST_ERROR
     } /* end if */
-    if(earray_stats.nindex_blks != state->nindex_blks) {
-        HDfprintf(stdout, "earray_stats.nindex_blks = %Hu, state->nindex_blks = %Hu\n", earray_stats.nindex_blks, state->nindex_blks);
+    if(earray_stats.computed.nindex_blks != state->nindex_blks) {
+        HDfprintf(stdout, "earray_stats.computed.nindex_blks = %Hu, state->nindex_blks = %Hu\n", earray_stats.computed.nindex_blks, state->nindex_blks);
         TEST_ERROR
     } /* end if */
-    if(earray_stats.index_blk_size != state->index_blk_size) {
-        HDfprintf(stdout, "earray_stats.index_blk_size = %Hu, state->index_blk_size = %Hu\n", earray_stats.index_blk_size, state->index_blk_size);
+    if(earray_stats.computed.index_blk_size != state->index_blk_size) {
+        HDfprintf(stdout, "earray_stats.computed.index_blk_size = %Hu, state->index_blk_size = %Hu\n", earray_stats.computed.index_blk_size, state->index_blk_size);
         TEST_ERROR
     } /* end if */
-    if(earray_stats.ndata_blks != state->ndata_blks) {
-        HDfprintf(stdout, "earray_stats.ndata_blks = %Hu, state->ndata_blks = %Hu\n", earray_stats.ndata_blks, state->ndata_blks);
+    if(earray_stats.stored.ndata_blks != state->ndata_blks) {
+        HDfprintf(stdout, "earray_stats.stored.ndata_blks = %Hu, state->ndata_blks = %Hu\n", earray_stats.stored.ndata_blks, state->ndata_blks);
         TEST_ERROR
     } /* end if */
 /* Don't compare this currently, it's very hard to compute */
 #ifdef NOT_YET
-    if(earray_stats.data_blk_size != state->data_blk_size) {
-        HDfprintf(stdout, "earray_stats.data_blk_size = %Hu, state->data_blk_size = %Hu\n", earray_stats.data_blk_size, state->data_blk_size);
+    if(earray_stats.stored.data_blk_size != state->data_blk_size) {
+        HDfprintf(stdout, "earray_stats.stored.data_blk_size = %Hu, state->data_blk_size = %Hu\n", earray_stats.stored.data_blk_size, state->data_blk_size);
         TEST_ERROR
     } /* end if */
 #endif /* NOT_YET */
-    if(earray_stats.nsuper_blks != state->nsuper_blks) {
-        HDfprintf(stdout, "earray_stats.nsuper_blks = %Hu, state->nsuper_blks = %Hu\n", earray_stats.nsuper_blks, state->nsuper_blks);
+    if(earray_stats.stored.nsuper_blks != state->nsuper_blks) {
+        HDfprintf(stdout, "earray_stats.stored.nsuper_blks = %Hu, state->nsuper_blks = %Hu\n", earray_stats.stored.nsuper_blks, state->nsuper_blks);
         TEST_ERROR
     } /* end if */
 /* Don't compare this currently, it's very hard to compute */
 #ifdef NOT_YET
-    if(earray_stats.super_blk_size != state->super_blk_size) {
-        HDfprintf(stdout, "earray_stats.super_blk_size = %Hu, state->super_blk_size = %Hu\n", earray_stats.super_blk_size, state->super_blk_size);
+    if(earray_stats.stored.super_blk_size != state->super_blk_size) {
+        HDfprintf(stdout, "earray_stats.stored.super_blk_size = %Hu, state->super_blk_size = %Hu\n", earray_stats.stored.super_blk_size, state->super_blk_size);
         TEST_ERROR
     } /* end if */
 #endif /* NOT_YET */
 #ifdef QAK
-HDfprintf(stderr, "nelmts = %Hu, total EA size = %Hu\n", earray_stats.nelmts,
-        (earray_stats.hdr_size + earray_stats.index_blk_size + earray_stats.super_blk_size + earray_stats.data_blk_size));
+HDfprintf(stderr, "nelmts = %Hu, total EA size = %Hu\n", earray_stats.stored.nelmts,
+        (earray_stats.computed.hdr_size + earray_stats.computed.index_blk_size + earray_stats.stored.super_blk_size + earray_stats.stored.data_blk_size));
 #endif /* QAK */
 
     /* All tests passed */
@@ -1198,7 +1198,7 @@ eiter_fw_state(void *_eiter, const H5EA_create_t *cparam,
     /* Compute the state of the extensible array */
     state->hdr_size = EA_HDR_SIZE;
     state->nindex_blks = 1;
-    state->index_blk_size = 298;
+    state->index_blk_size = EA_IBLOCK_SIZE;
     state->max_idx_set = idx + 1;
     if(idx < cparam->idx_blk_elmts) {
         state->nelmts = (hsize_t)cparam->idx_blk_elmts;
@@ -1416,7 +1416,7 @@ eiter_rv_state(void *_eiter, const H5EA_create_t *cparam,
     /* Compute the state of the extensible array */
     state->hdr_size = EA_HDR_SIZE;
     state->nindex_blks = 1;
-    state->index_blk_size = 298;
+    state->index_blk_size = EA_IBLOCK_SIZE;
     state->max_idx_set = eiter->max + 1;
     if(eiter->max < cparam->idx_blk_elmts) {
         state->nelmts = (hsize_t)cparam->idx_blk_elmts;