[svn-r15922] Description:

	Bring revisions 15289:15457 from trunk into metadata journaling
branch.

Tested on:
        FreeBSD/32 6.2 (duty) in debug mode
        FreeBSD/64 6.2 (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/default API=1.6.x, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Mac OS X/32 10.5.2 (amazon) in debug mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode

1 files changed, 6 insertions, 7 deletions

diff --git a/src/H5Gname.c b/src/H5Gname.c
index 1efb91e..c5fc2c1 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -700,19 +700,19 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
         HGOTO_DONE(SUCCEED)     /* No need to look at object, it's path is already invalid */
 
     /* Find the top file in object's mount hier. */
-    if(oloc->file->mtab.parent) {
+    if(oloc->file->parent) {
         /* Check if object is in child file (for mount & unmount operations) */
         if(names->dst_file && oloc->file->shared == names->dst_file->shared)
             obj_in_child = TRUE;
 
         /* Find the "top" file in the chain of mounted files */
-        top_obj_file = oloc->file->mtab.parent;
-        while(top_obj_file->mtab.parent != NULL) {
+        top_obj_file = oloc->file->parent;
+        while(top_obj_file->parent != NULL) {
             /* Check if object is in child mount hier. (for mount & unmount operations) */
             if(names->dst_file && top_obj_file->shared == names->dst_file->shared)
                 obj_in_child = TRUE;
 
-            top_obj_file = top_obj_file->mtab.parent;
+            top_obj_file = top_obj_file->parent;
         } /* end while */
     } /* end if */
     else
@@ -997,8 +997,8 @@ H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
             H5G_names_t names;          /* Structure to hold operation information for callback */
 
             /* Find top file in src location's mount hierarchy */
-            while(src_file->mtab.parent)
-                src_file = src_file->mtab.parent;
+            while(src_file->parent)
+                src_file = src_file->parent;
 
             /* Set up common information for callback */
             names.src_file = src_file;
@@ -1173,4 +1173,3 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5G_get_name_by_addr() */
-