[svn-r17408] Description:

	Move flush operation on mounted file hierarchy into H5Fmount module.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.8 (amazon) in debug mode
        Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

3 files changed, 89 insertions, 26 deletions

diff --git a/src/H5F.c b/src/H5F.c
index 4212d6e..352f97c 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -72,7 +72,6 @@ static H5F_t *H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id,
                       H5FD_t *lf);
 static herr_t H5F_dest(H5F_t *f, hid_t dxpl_id);
 static herr_t H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope);
-static herr_t H5F_flush_real(H5F_t *f, hid_t dxpl_id, hbool_t closing);
 static herr_t H5F_close(H5F_t *f);
 
 /* Declare a free list to manage the H5F_t struct */
@@ -1633,7 +1632,6 @@ done:
 static herr_t
 H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope)
 {
-    unsigned		nerrors = 0;    /* Errors from nested flushes */
     herr_t              ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5F_flush)
@@ -1643,29 +1641,15 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope)
 
     /* Flush other files, depending on scope */
     if(H5F_SCOPE_GLOBAL == scope) {
-        /* Find the top file in the mount hierarchy */
-	while(f->parent)
-            f = f->parent;
-
-        /* Switch to 'down' scope for further flushing */
-	scope = H5F_SCOPE_DOWN;
-    } /* end while */
-    if(H5F_SCOPE_DOWN == scope) {
-        unsigned u;              /* Index variable */
-
-        /* Flush all child files, not stopping for errors */
-        for(u = 0; u < f->shared->mtab.nmounts; u++)
-            if(H5F_flush(f->shared->mtab.child[u].file, dxpl_id, scope) < 0)
-                nerrors++;
+        /* Call the flush routine for mounted file hierarchies */
+        if(H5F_flush_mounts(f, dxpl_id) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush mounted file hierarchy")
     } /* end if */
-
-    /* Call the "real" flush routine, for this file */
-    if(H5F_flush_real(f, dxpl_id, FALSE) < 0)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's cached information")
-
-    /* Check flush errors for children - errors are already on the stack */
-    if(nerrors)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's child mounts")
+    else {
+        /* Call the "real" flush routine, for this file */
+        if(H5F_flush_real(f, dxpl_id, FALSE) < 0)
+            HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's cached information")
+    } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1685,13 +1669,13 @@ done:
  *
  *-------------------------------------------------------------------------
  */
-static herr_t
+herr_t
 H5F_flush_real(H5F_t *f, hid_t dxpl_id, hbool_t closing)
 {
     unsigned H5AC_flags = H5AC__NO_FLAGS_SET;   /* Flags for H5AC_flush() */
     herr_t   ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5F_flush_real)
+    FUNC_ENTER_NOAPI(H5F_flush_real, FAIL)
 
     /* Sanity check arguments */
     HDassert(f);
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index ff4b1eb..c779d9c 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -627,3 +627,80 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_mount_count_ids() */
 
+
+/*-------------------------------------------------------------------------
+ * Function:	H5F_flush_mounts_recurse
+ *
+ * Purpose:	Flush a mount hierarchy, recursively
+ *
+ * Return:	SUCCEED/FAIL
+ *
+ * Programmer:	Quincey Koziol
+ *              Fri, August 21, 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5F_flush_mounts_recurse(H5F_t *f, hid_t dxpl_id)
+{
+    unsigned	nerrors = 0;            /* Errors from recursive flushes */
+    unsigned    u;                      /* Index variable */
+    herr_t      ret_value = SUCCEED;    /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5F_flush_mounts_recurse)
+
+    /* Sanity check */
+    HDassert(f);
+
+    /* Flush all child files, not stopping for errors */
+    for(u = 0; u < f->shared->mtab.nmounts; u++)
+        if(H5F_flush_mounts_recurse(f->shared->mtab.child[u].file, dxpl_id) < 0)
+            nerrors++;
+
+    /* Call the "real" flush routine, for this file */
+    if(H5F_flush_real(f, dxpl_id, FALSE) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's cached information")
+
+    /* Check flush errors for children - errors are already on the stack */
+    if(nerrors)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush file's child mounts")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5F_flush_mounts_recurse() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5F_flush_mounts
+ *
+ * Purpose:	Flush a mount hierarchy
+ *
+ * Return:	SUCCEED/FAIL
+ *
+ * Programmer:	Quincey Koziol
+ *              Fri, August 21, 2009
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5F_flush_mounts(H5F_t *f, hid_t dxpl_id)
+{
+    herr_t      ret_value = SUCCEED;       /* Return value */
+
+    FUNC_ENTER_NOAPI(H5F_flush_mounts, FAIL)
+
+    /* Sanity check */
+    HDassert(f);
+
+    /* Find the top file in the mount hierarchy */
+    while(f->parent)
+        f = f->parent;
+
+    /* Flush the mounted file hierarchy */
+    if(H5F_flush_mounts_recurse(f, dxpl_id) < 0)
+        HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush mounted file hierarchy")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5F_flush_mounts() */
+
diff --git a/src/H5Fpkg.h b/src/H5Fpkg.h
index 1ec66b7..62f646d 100644
--- a/src/H5Fpkg.h
+++ b/src/H5Fpkg.h
@@ -288,11 +288,13 @@ H5_DLLVAR const H5AC_class_t H5AC_SUPERBLOCK[1];
 /* General routines */
 H5_DLL herr_t H5F_init(void);
 H5_DLL haddr_t H5F_locate_signature(H5FD_t *file, hid_t dxpl_id);
+H5_DLL herr_t H5F_flush_real(H5F_t *f, hid_t dxpl_id, hbool_t closing);
 
 /* File mount related routines */
 H5_DLL herr_t H5F_close_mounts(H5F_t *f);
 H5_DLL int H5F_term_unmount_cb(void *obj_ptr, hid_t obj_id, void *key);
 H5_DLL herr_t H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs);
+H5_DLL herr_t H5F_flush_mounts(H5F_t *f, hid_t dxpl_id);
 
 /* Superblock related routines */
 H5_DLL herr_t H5F_super_init(H5F_t *f, hid_t dxpl_id);