diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2020-07-09 20:38:38 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2020-07-09 20:38:38 (GMT) |
| commit | 252c57f8d0bc9fb650e15b7536b7b26a07e34eac (patch) | |
| tree | 5b73a03ac6a4b8d1bfb6f4f008c6c788c737bfa1 /src/H5MF.c | |
| parent | 348b6d97a77a4c272dbd8b769a1cfb8e3840c2ce (diff) | |
| download | hdf5-252c57f8d0bc9fb650e15b7536b7b26a07e34eac.zip hdf5-252c57f8d0bc9fb650e15b7536b7b26a07e34eac.tar.gz hdf5-252c57f8d0bc9fb650e15b7536b7b26a07e34eac.tar.bz2 | |
H5F and H5FS normalization with develop.
Diffstat (limited to 'src/H5MF.c')
| -rw-r--r-- | src/H5MF.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -2294,6 +2294,7 @@ H5MF_get_freespace(H5F_t *f, hsize_t *tot_space, hsize_t *meta_size) needed_ring = H5AC_RING_MDFSM; else needed_ring = H5AC_RING_RDFSM; + if(needed_ring != curr_ring) { H5AC_set_ring(needed_ring, NULL); curr_ring = needed_ring; @@ -2307,7 +2308,7 @@ H5MF_get_freespace(H5F_t *f, hsize_t *tot_space, hsize_t *meta_size) /* Retrieve free space size from free space manager */ if(H5FS_sect_stats(f->shared->fs_man[type], &type_fs_size, NULL) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query free space stats") - if(H5FS_size(f, f->shared->fs_man[type], &type_meta_size) < 0) + if(H5FS_size(f->shared->fs_man[type], &type_meta_size) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTGET, FAIL, "can't query free space metadata stats") /* Increment total free space for types */ @@ -2323,6 +2324,7 @@ H5MF_get_freespace(H5F_t *f, hsize_t *tot_space, hsize_t *meta_size) needed_ring = H5AC_RING_MDFSM; else needed_ring = H5AC_RING_RDFSM; + if(needed_ring != curr_ring) { H5AC_set_ring(needed_ring, &curr_ring); curr_ring = needed_ring; @@ -2438,6 +2440,7 @@ H5MF_get_free_sections(H5F_t *f, H5FD_mem_t type, size_t nsects, H5F_sect_info_t needed_ring = H5AC_RING_MDFSM; else needed_ring = H5AC_RING_RDFSM; + if(needed_ring != curr_ring) { H5AC_set_ring(needed_ring, &curr_ring); curr_ring = needed_ring; |