summaryrefslogtreecommitdiffstats
path: root/src/H5C.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-06-11 22:42:04 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-06-11 22:42:04 (GMT)
commit749a718c235f8d97df62b1ed8fb13b757f36ab77 (patch)
treeed3830ada62d80312e7d96adbfacdb814fbd6eaa /src/H5C.c
parentf8a26a86c689be6c000c011f0fc69620f7369369 (diff)
parentff43cd3631eaa13886933db3030728fc374c7123 (diff)
downloadhdf5-749a718c235f8d97df62b1ed8fb13b757f36ab77.zip
hdf5-749a718c235f8d97df62b1ed8fb13b757f36ab77.tar.gz
hdf5-749a718c235f8d97df62b1ed8fb13b757f36ab77.tar.bz2
Merge branch 'feature/vfd_swmr' into may-merge-mainzer-to-mine
Diffstat (limited to 'src/H5C.c')
-rw-r--r--src/H5C.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5C.c b/src/H5C.c
index 146a725..9ebf0c6 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -1089,9 +1089,10 @@ H5C_evict_or_refresh_all_entries_in_page(H5F_t * f, uint64_t page,
HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, \
"can't evict pinned and tagged entries")
- /* *entry_ptr should be evicted -- set entry_ptr to NULL */
- entry_ptr = NULL;
-
+ /* Both follow_ptr and entry_ptr may have been removed.
+ * Set both to NULL to force the scan to restart.
+ */
+ follow_ptr = entry_ptr = NULL;
} else if ( entry_ptr->type->refresh ) {
#if 0 /* JRM */
HDfprintf(stderr, "refreshing addr/page/tag == %lld/%lld\n",