summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2012-12-13 21:40:19 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2012-12-13 21:40:19 (GMT)
commitcec83436f2abbe52e15c76a53703d5a10b237470 (patch)
treef1fa081f60831421efce3b4a28e388eeecb77a24 /src
parentadc36c3b4b53520a6f4ba263943f847e3fafeb71 (diff)
downloadhdf5-cec83436f2abbe52e15c76a53703d5a10b237470.zip
hdf5-cec83436f2abbe52e15c76a53703d5a10b237470.tar.gz
hdf5-cec83436f2abbe52e15c76a53703d5a10b237470.tar.bz2
[svn-r23101] Minor corrections to r23095
Tested: ummon
Diffstat (limited to 'src')
-rw-r--r--src/H5Cpkg.h1
-rw-r--r--src/H5EAcache.c16
2 files changed, 5 insertions, 12 deletions
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 4d3caac..4c7e40d 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -44,6 +44,7 @@
#include "H5SLprivate.h" /* Skip lists */
+
/****************************************************************************
*
* structure H5C_t
diff --git a/src/H5EAcache.c b/src/H5EAcache.c
index 3ed6430..055293e 100644
--- a/src/H5EAcache.c
+++ b/src/H5EAcache.c
@@ -868,9 +868,7 @@ H5EA__cache_iblock_notify(H5AC_notify_action_t action, H5EA_iblock_t *iblock))
break;
case H5AC_NOTIFY_ACTION_BEFORE_EVICT:
- /* Destroy flush dependency on extensible array header */
- if(H5EA__destroy_flush_depend((H5AC_info_t *)iblock->hdr, (H5AC_info_t *)iblock) < 0)
- H5E_THROW(H5E_CANTUNDEPEND, "unable to destroy flush dependency between index block and header, address = %llu", (unsigned long long)iblock->addr)
+ /* Nothing to do */
break;
default:
@@ -1299,9 +1297,7 @@ H5EA__cache_sblock_notify(H5AC_notify_action_t action, H5EA_sblock_t *sblock))
break;
case H5AC_NOTIFY_ACTION_BEFORE_EVICT:
- /* Destroy flush dependency on index block */
- if(H5EA__destroy_flush_depend((H5AC_info_t *)sblock->parent, (H5AC_info_t *)sblock) < 0)
- H5E_THROW(H5E_CANTUNDEPEND, "unable to destroy flush dependency between super block and index block, address = %llu", (unsigned long long)sblock->addr)
+ /* Nothing to do */
break;
default:
@@ -1664,9 +1660,7 @@ H5EA__cache_dblock_notify(H5AC_notify_action_t action, H5EA_dblock_t *dblock))
break;
case H5AC_NOTIFY_ACTION_BEFORE_EVICT:
- /* Destroy flush dependency on parent */
- if(H5EA__destroy_flush_depend((H5AC_info_t *)dblock->parent, (H5AC_info_t *)dblock) < 0)
- H5E_THROW(H5E_CANTUNDEPEND, "unable to destroy flush dependency between data block and parent, address = %llu", (unsigned long long)dblock->addr)
+ /* Nothing to do */
break;
default:
@@ -2019,9 +2013,7 @@ H5EA__cache_dblk_page_notify(H5AC_notify_action_t action, H5EA_dblk_page_t *dblk
break;
case H5AC_NOTIFY_ACTION_BEFORE_EVICT:
- /* Destroy flush dependency on parent */
- if(H5EA__destroy_flush_depend((H5AC_info_t *)dblk_page->parent, (H5AC_info_t *)dblk_page) < 0)
- H5E_THROW(H5E_CANTUNDEPEND, "unable to destroy flush dependency between data block page and parent, address = %llu", (unsigned long long)dblk_page->addr)
+ /* Nothing to do */
break;
default: