diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-06-06 03:49:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-06-06 03:49:55 (GMT) |
| commit | a580fdedc162b8c4a244fec2f0ac68a8d9ebba3a (patch) | |
| tree | cfba05ad8e104fd230a75b237b1db6fb150b5bc3 /src/H5B.c | |
| parent | 20534386613804a7300ea7b8c421a52d0cfd4255 (diff) | |
| download | hdf5-a580fdedc162b8c4a244fec2f0ac68a8d9ebba3a.zip hdf5-a580fdedc162b8c4a244fec2f0ac68a8d9ebba3a.tar.gz hdf5-a580fdedc162b8c4a244fec2f0ac68a8d9ebba3a.tar.bz2 | |
[svn-r30025] Description;
Bring a few code cleanups in from thr revise_chunks branch.
Tested on:
MacOSX/64 10.11.5 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'src/H5B.c')
| -rw-r--r-- | src/H5B.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1053,6 +1053,7 @@ H5B__insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, /* * Handle changes/additions to children */ + HDassert(!(bt->level == 0) != !(child_bt_ud.bt)); if(H5B_INS_CHANGE == my_ins) { /* * The insertion simply changed the address for the child. @@ -1432,9 +1433,9 @@ H5B__remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *typ bt->nchildren = 0; /* Delete the node from disk (via the metadata cache) */ - bt_flags |= H5AC__DIRTIED_FLAG; + bt_flags |= H5AC__DIRTIED_FLAG | H5AC__FREE_FILE_SPACE_FLAG; H5_CHECK_OVERFLOW(shared->sizeof_rnode, size_t, hsize_t); - if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, bt_flags | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG) < 0) { + if(H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, bt_flags | H5AC__DELETED_FLAG) < 0) { bt = NULL; bt_flags = H5AC__NO_FLAGS_SET; HGOTO_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, H5B_INS_ERROR, "unable to free B-tree node") |