[svn-r18485] Description:

	Bring r18484 from trunk to 1.8 branch:

	Bring r18483 from metadata journaling 'merging' branch to trunk:

	Remove unused symbol table entry dirty flag

Tested on:
	FreeBSD/32 6.3 (duty) w/debug
	(h5committested on trunk)

5 files changed, 1 insertions, 24 deletions

diff --git a/src/H5Gcache.c b/src/H5Gcache.c
index adc9be9..a5805e3 100644
--- a/src/H5Gcache.c
+++ b/src/H5Gcache.c
@@ -235,18 +235,6 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
     HDassert(sym);
 
     /*
-     * Look for dirty entries and set the node dirty flag.
-     */
-    for(u = 0; u < sym->nsyms; u++)
-	if(sym->entry[u].dirty) {
-            /* Set the node's dirty flag */
-            sym->cache_info.is_dirty = TRUE;
-
-            /* Reset the entry's dirty flag */
-            sym->entry[u].dirty = FALSE;
-        } /* end if */
-
-    /*
      * Write the symbol node to disk.
      */
     if(sym->cache_info.is_dirty) {
@@ -377,7 +365,6 @@ done:
 static herr_t
 H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy)
 {
-    unsigned u;              /* Local index variable */
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT(H5G_node_clear)
@@ -387,9 +374,7 @@ H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy)
      */
     HDassert(sym);
 
-    /* Look for dirty entries and reset their dirty flag.  */
-    for(u = 0; u < sym->nsyms; u++)
-        sym->entry[u].dirty = FALSE;
+    /* Reset the node's dirty flag */
     sym->cache_info.is_dirty = FALSE;
 
     /*
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 9188009..8e87995 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -435,9 +435,6 @@ H5G_ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
 	      "Object header address:", ent->header);
 
-    HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
-	      "Dirty:",
-	      ent->dirty ? "Yes" : "No");
     HDfprintf(stream, "%*s%-*s ", indent, "", fwidth,
 	      "Cache info type:");
     switch(ent->type) {
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 8154200..c65d988 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -701,9 +701,6 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     /* Copy new entry into table */
     H5G_ent_copy(&(insert_into->entry[idx]), &ent, H5_COPY_SHALLOW);
 
-    /* Flag entry as dirty */
-    insert_into->entry[idx].dirty = TRUE;
-
     /* Increment # of symbols in table */
     insert_into->nsyms += 1;
 
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index e599123..652a6e1 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -102,7 +102,6 @@ typedef union H5G_cache_t {
  * points.
  */
 struct H5G_entry_t {
-    hbool_t     dirty;                  /*entry out-of-date?                 */
     H5G_cache_type_t type;              /*type of information cached         */
     H5G_cache_t cache;                  /*cached data from object header     */
     size_t      name_off;               /*offset of name within name heap    */
diff --git a/src/H5Groot.c b/src/H5Groot.c
index bcb724e..1110b19 100644
--- a/src/H5Groot.c
+++ b/src/H5Groot.c
@@ -156,7 +156,6 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_CANTALLOC, FAIL, "can't allocate space for symbol table entry")
 
             /* Initialize the root group symbol table entry */
-            f->shared->sblock->root_ent->dirty = TRUE;
             f->shared->sblock->root_ent->type = H5G_NOTHING_CACHED; /* We will cache the stab later */
             f->shared->sblock->root_ent->name_off = 0;  /* No name (yet) */
             f->shared->sblock->root_ent->header = root_loc.oloc->addr;