Bring over support for retrying metadata cache entry loads, along with all the

supporting metadata cache callback changes, etc.

1 files changed, 2 insertions, 8 deletions

diff --git a/src/H5HLdblk.c b/src/H5HLdblk.c
index 69e0334..f90562b 100644
--- a/src/H5HLdblk.c
+++ b/src/H5HLdblk.c
@@ -119,10 +119,9 @@ H5HL__dblk_new(H5HL_t *heap))
 
 CATCH
     /* Ensure that the data block memory is deallocated on errors */
-    if(!ret_value && dblk != NULL) {
+    if(!ret_value && dblk != NULL)
         /* H5FL_FREE always returns NULL so we can't check for errors */
         dblk = H5FL_FREE(H5HL_dblk_t, dblk);
-    }
 
 END_FUNC(PKG) /* end H5HL__dblk_new() */
 
@@ -151,10 +150,6 @@ H5HL__dblk_dest(H5HL_dblk_t *dblk))
         /* Unlink data block from heap */
         dblk->heap->dblk = NULL;
 
-        /* Unpin the local heap prefix */
-        if(FAIL == H5AC_unpin_entry(dblk->heap->prfx))
-            H5E_THROW(H5E_CANTUNPIN, "can't unpin local heap prefix")
-
         /* Decrement ref. count on heap data structure */
         if(FAIL == H5HL__dec_rc(dblk->heap))
             H5E_THROW(H5E_CANTDEC, "can't decrement heap ref. count")
@@ -223,7 +218,6 @@ H5HL__dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size))
             /* Resize the heap prefix in the cache */
             if(FAIL == H5AC_resize_entry(heap->prfx, (size_t)(heap->prfx_size + new_heap_size)))
                 H5E_THROW(H5E_CANTRESIZE, "unable to resize heap in cache");
-
         } /* end if */
         else {
             /* Sanity check */
@@ -233,7 +227,6 @@ H5HL__dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size))
             /* Resize the heap data block in the cache */
             if(H5AC_resize_entry(heap->dblk, (size_t)new_heap_size) < 0)
                 H5E_THROW(H5E_CANTRESIZE, "unable to resize heap (data block) in cache");
-
         } /* end else */
     } /* end if */
     else {
@@ -280,3 +273,4 @@ CATCH
     } /* end if */
 
 END_FUNC(PKG) /* end H5HL__dblk_realloc() */
+