diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2013-11-30 08:12:26 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2013-11-30 08:12:26 (GMT) |
| commit | c42a36b093535d8c3a96cb539918423d220891a2 (patch) | |
| tree | 7ede61abe27f4bbfbfb3a3aecedfdb97634c208a /src/H5Faccum.c | |
| parent | a9946535de1cbb1158d8cc78d62c8cc8d978e476 (diff) | |
| download | hdf5-c42a36b093535d8c3a96cb539918423d220891a2.zip hdf5-c42a36b093535d8c3a96cb539918423d220891a2.tar.gz hdf5-c42a36b093535d8c3a96cb539918423d220891a2.tar.bz2 | |
[svn-r24478] Description:
Review Vailin's "metadata retry" code and make various cleanups to it.
Also, disallow SWMR access for non-latest format and for non-POSIX VFDs.
Tested on:
Mac OSX/64 10.9.0 (amazon) w/gcc 4.8 and make check-vfd
Diffstat (limited to 'src/H5Faccum.c')
| -rw-r--r-- | src/H5Faccum.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Faccum.c b/src/H5Faccum.c index 529384b..949ebde 100644 --- a/src/H5Faccum.c +++ b/src/H5Faccum.c @@ -431,7 +431,7 @@ H5F_accum_write(const H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, HDassert(f); HDassert(f->shared); - HDassert(f->intent & H5F_ACC_RDWR); + HDassert(H5F_INTENT(f) & H5F_ACC_RDWR); HDassert(buf); /* Treat global heap as raw data */ @@ -731,7 +731,7 @@ HDmemset(f->shared->accum.buf + size, 0, (f->shared->accum.alloc_size - size)); } /* end else */ } /* end if */ else { - if((f->intent & H5F_ACC_SWMR_WRITE) > 0) { + if((H5F_INTENT(f) & H5F_ACC_SWMR_WRITE) > 0) { /* Flush if dirty and reset accumulator */ if(H5F_accum_reset(f, dxpl_id, TRUE) < 0) HGOTO_ERROR(H5E_IO, H5E_CANTRESET, FAIL, "can't reset accumulator") |