summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/H5D.c10
-rw-r--r--src/H5F.c12
2 files changed, 4 insertions, 18 deletions
diff --git a/src/H5D.c b/src/H5D.c
index 2f80c2a..fea42af 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -1144,13 +1144,11 @@ printf("%s: check 0.5\n",FUNC);
printf("%s: check 1.0\n",FUNC);
#endif /* QAK */
if (0==efl->nused) {
- if (H5F_arr_create(f, &(new_dset->layout)) < 0) {
- HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL,
- "unable to initialize storage");
- }
- } else {
+ if (H5F_arr_create(f, &(new_dset->layout)) < 0)
+ HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to initialize storage");
+ } /* end if */
+ else
new_dset->layout.addr = HADDR_UNDEF;
- }
#ifdef QAK
printf("%s: check 2.0\n",FUNC);
diff --git a/src/H5F.c b/src/H5F.c
index 34b66f7..6dd0ec8 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -739,18 +739,6 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id)
f->shared->gc_ref = fapl->gc_ref;
f->shared->sieve_buf_size = fapl->sieve_buf_size;
-#ifdef H5_HAVE_PARALLEL
- /*
- * Disable cache if file is open using MPIO driver. Parallel
- * does not permit caching. (maybe able to relax it for
- * read only open.)
- */
- if (H5FD_MPIO==fapl->driver_id){
- f->shared->rdcc_nbytes = 0;
- f->shared->mdc_nelmts = 0;
- }
-#endif
-
/*
* Create a meta data cache with the specified number of elements.
* The cache might be created with a different number of elements and