[svn-r18358] Description:

	Bring r18357 from trunk to 1.8 branch:

	Bring r18356 from metadata journaling merge branch to trunk:

	Converge metadata journaling branch with trunk with a bunch of v1 B-tree
changes:
      - Remove H5ACprivate.h header from H5Bprivate.h header
      - Revise v1 B-tree client callbacks
      - Get rid of H5B_serialize() by bringing it into H5B_flush()

Tested on:
       FreeBSD/32 6.3 (duty) in debug mode
       FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
       Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode

1 files changed, 7 insertions, 10 deletions

diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index b0ffa07..83a357b 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -33,9 +33,7 @@
 
 /* Private headers needed by this file */
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"	/* Metadata cache			*/
 #include "H5Fprivate.h"		/* File access				*/
-#include "H5FLprivate.h"	/* Free Lists                           */
 #include "H5RCprivate.h"	/* Reference counted object functions	*/
 
 /**************************/
@@ -89,9 +87,6 @@ typedef enum H5B_dir_t {
 typedef int (*H5B_operator_t)(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
                                         const void *_rt_key, void *_udata);
 
-/* Typedef for B-tree in memory (defined in H5Bpkg.h) */
-typedef struct H5B_t H5B_t;
-
 /* Each B-tree has certain information that can be shared across all
  * the instances of nodes in that B-tree.
  */
@@ -101,6 +96,8 @@ typedef struct H5B_shared_t {
     size_t		sizeof_rkey;	/* Size of raw (disk) key	     */
     size_t		sizeof_rnode;	/* Size of raw (disk) node	     */
     size_t		sizeof_keys;	/* Size of native (memory) key node  */
+    size_t              sizeof_addr;    /* Size of file address (in bytes)   */
+    size_t              sizeof_len;     /* Size of file lengths (in bytes)   */
     uint8_t	        *page;	        /* Disk page */
     size_t              *nkey;          /* Offsets of each native key in native key buffer */
 } H5B_shared_t;
@@ -118,8 +115,8 @@ typedef struct H5B_class_t {
     size_t	sizeof_nkey;			/*size of native (memory) key*/
     H5RC_t *    (*get_shared)(const H5F_t*, const void*);    /*shared info for node */
     herr_t	(*new_node)(H5F_t*, hid_t, H5B_ins_t, void*, void*, void*, haddr_t*);
-    int         (*cmp2)(H5F_t*, hid_t, void*, void*, void*);	    /*compare 2 keys */
-    int         (*cmp3)(H5F_t*, hid_t, void*, void*, void*);	    /*compare 3 keys */
+    int         (*cmp2)(void*, void*, void*);	    /*compare 2 keys */
+    int         (*cmp3)(void*, void*, void*);	    /*compare 3 keys */
     htri_t	(*found)(H5F_t*, hid_t, haddr_t, const void*, void*);
 
     /* insert new data */
@@ -138,9 +135,9 @@ typedef struct H5B_class_t {
 			  hbool_t*);
 
     /* encode, decode, debug key values */
-    herr_t	(*decode)(const H5F_t*, const struct H5B_t*, const uint8_t*, void*);
-    herr_t	(*encode)(const H5F_t*, const struct H5B_t*, uint8_t*, void*);
-    herr_t	(*debug_key)(FILE*, H5F_t*, hid_t, int, int, const void*, const void*);
+    herr_t	(*decode)(const H5B_shared_t*, const uint8_t*, void*);
+    herr_t	(*encode)(const H5B_shared_t*, uint8_t*, const void*);
+    herr_t	(*debug_key)(FILE*, int, int, const void*, const void*);
 } H5B_class_t;
 
 /* Information about B-tree */