[svn-r2491] Added type of data parameter to H5F_block_write calls.

6 files changed, 10 insertions, 10 deletions

diff --git a/src/H5B.c b/src/H5B.c
index 8801bb1..1b91975 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -482,7 +482,7 @@ H5B_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5B_t *bt)
 	if (IS_H5FD_MPIO(f))
 	    H5FD_mpio_tas_allsame(f->shared->lf, TRUE); /* only p0 will write */
 #endif /* H5_HAVE_PARALLEL */
-	if (H5F_block_write(f, addr, (hsize_t)size, H5P_DEFAULT, bt->page)<0) {
+	if (H5F_block_write(f, H5FD_MEM_BTREE, addr, (hsize_t)size, H5P_DEFAULT, bt->page)<0) {
 	    HRETURN_ERROR(H5E_BTREE, H5E_CANTFLUSH, FAIL,
 			  "unable to save B-tree node to disk");
 	}
diff --git a/src/H5D.c b/src/H5D.c
index d19ea37..5e6b3ce 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -2526,7 +2526,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
 				    "unable to write fill value to dataset");
 		    }
 		} else {
-		    if (H5F_block_write(dset->ent.file, addr, size,
+		    if (H5F_block_write(dset->ent.file, H5FD_MEM_DRAW, addr, size,
 					H5P_DEFAULT, buf)<0) {
 			HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
 				    "unable to write fill value to dataset");
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index d1d8828..7165d54 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -372,7 +372,7 @@ H5G_node_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5G_node_t *sym)
         if (IS_H5FD_MPIO(f))
             H5FD_mpio_tas_allsame(f->shared->lf, TRUE); /*only p0 will write*/
 #endif /* H5_HAVE_PARALLEL */
-        status = H5F_block_write(f, addr, (hsize_t)size, H5P_DEFAULT, buf);
+        status = H5F_block_write(f, H5FD_MEM_BTREE, addr, (hsize_t)size, H5P_DEFAULT, buf);
         if (status < 0)
             HRETURN_ERROR(H5E_SYM, H5E_WRITEERROR, FAIL,
                   "unable to write symbol table node to the file");
diff --git a/src/H5HG.c b/src/H5HG.c
index a76dbe7..27e62f2 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -408,7 +408,7 @@ H5HG_flush (H5F_t *f, hbool_t destroy, haddr_t addr, H5HG_heap_t *heap)
     assert (heap);
 
     if (heap->dirty) {
-	if (H5F_block_write (f, addr, (hsize_t)(heap->size),
+	if (H5F_block_write (f, H5FD_MEM_GHEAP, addr, (hsize_t)(heap->size),
 			     H5P_DEFAULT, heap->chunk)<0) {
 	    HRETURN_ERROR (H5E_HEAP, H5E_WRITEERROR, FAIL,
 			   "unable to write global heap collection to file");
diff --git a/src/H5HL.c b/src/H5HL.c
index 99c57da..1b72e81 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -395,7 +395,7 @@ H5HL_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5HL_t *heap)
 	    if (IS_H5FD_MPIO(f))
 		H5FD_mpio_tas_allsame( f->shared->lf, TRUE ); /* only p0 writes */
 #endif /* H5_HAVE_PARALLEL */
-	    if (H5F_block_write(f, addr,
+	    if (H5F_block_write(f, H5FD_MEM_LHEAP, addr,
 				(hsize_t)(H5HL_SIZEOF_HDR(f)+heap->disk_alloc),
 				H5P_DEFAULT, heap->chunk) < 0) {
 		HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL,
@@ -406,7 +406,7 @@ H5HL_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5HL_t *heap)
 	    if (IS_H5FD_MPIO(f))
 		H5FD_mpio_tas_allsame( f->shared->lf, TRUE ); /* only p0 writes */
 #endif /* H5_HAVE_PARALLEL */
-	    if (H5F_block_write(f, addr, (hsize_t)H5HL_SIZEOF_HDR(f),
+	    if (H5F_block_write(f, H5FD_MEM_LHEAP, addr, (hsize_t)H5HL_SIZEOF_HDR(f),
 				H5P_DEFAULT, heap->chunk)<0) {
 		HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL,
 			      "unable to write heap header to file");
@@ -415,7 +415,7 @@ H5HL_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5HL_t *heap)
 	    if (IS_H5FD_MPIO(f))
 		H5FD_mpio_tas_allsame( f->shared->lf, TRUE ); /* only p0 writes */
 #endif /* H5_HAVE_PARALLEL */
-	    if (H5F_block_write(f, heap->addr, (hsize_t)(heap->disk_alloc),
+	    if (H5F_block_write(f, H5FD_MEM_LHEAP, heap->addr, (hsize_t)(heap->disk_alloc),
 				H5P_DEFAULT,
 				heap->chunk + H5HL_SIZEOF_HDR(f)) < 0) {
 		HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL,
diff --git a/src/H5O.c b/src/H5O.c
index a064da1..5284c80 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -583,7 +583,7 @@ H5O_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5O_t *oh)
         if (IS_H5FD_MPIO(f))
             H5FD_mpio_tas_allsame(f->shared->lf, TRUE); /*only p0 will write*/
 #endif /* H5_HAVE_PARALLEL */
-        if (H5F_block_write(f, addr, (hsize_t)H5O_SIZEOF_HDR(f), 
+        if (H5F_block_write(f, H5FD_MEM_OHDR, addr, (hsize_t)H5O_SIZEOF_HDR(f), 
                     H5P_DEFAULT, buf) < 0) {
             HRETURN_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL,
                   "unable to write object header hdr to disk");
@@ -673,7 +673,7 @@ H5O_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5O_t *oh)
                 if (IS_H5FD_MPIO(f))
                     H5FD_mpio_tas_allsame(f->shared->lf, TRUE); /*only p0 write*/
 #endif /* H5_HAVE_PARALLEL */
-                if (H5F_block_write(f, addr,
+                if (H5F_block_write(f, H5FD_MEM_OHDR, addr,
                             (hsize_t)(H5O_SIZEOF_HDR(f)+oh->chunk[i].size),
                             H5P_DEFAULT, p) < 0) {
                     HRETURN_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL,
@@ -688,7 +688,7 @@ H5O_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5O_t *oh)
                 if (IS_H5FD_MPIO(f))
                 H5FD_mpio_tas_allsame(f->shared->lf, TRUE); /*only p0 write*/
 #endif /* H5_HAVE_PARALLEL */
-                if (H5F_block_write(f, oh->chunk[i].addr,
+                if (H5F_block_write(f, H5FD_MEM_OHDR, oh->chunk[i].addr,
                             (hsize_t)(oh->chunk[i].size),
                             H5P_DEFAULT, oh->chunk[i].image) < 0) {
                     HRETURN_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL,