summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-06-06 03:49:55 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-06-06 03:49:55 (GMT)
commita580fdedc162b8c4a244fec2f0ac68a8d9ebba3a (patch)
treecfba05ad8e104fd230a75b237b1db6fb150b5bc3
parent20534386613804a7300ea7b8c421a52d0cfd4255 (diff)
downloadhdf5-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)
-rw-r--r--src/H5B.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/H5B.c b/src/H5B.c
index fcf61e1..2c49c81 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -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")