[svn-r13477] Description:

		The main purpose of this checkin was to eliminate the
space used for tracking creation time indices when there is no way they
can be used (i.e. attributes can't be shared in the file and the user hasn't
turned on attribute creation tracking), however there were some other minor
changes which crept in:
	- Fix a cache locking deadlock when a shared attribute and one of its
		components end up in the same fractal heap direct block.  
		(This is fixed the "slow" way for right now, until John has time
		to add support for readers/writer locking to the cache.
	- Optimize attribute copying when a copy will be kept during a v2 B-tree
		search.
	- When freeing a block on disk, attempt to merge it with the metadata
		and "small data" aggregators.

Tested on:
	Mac OS X/32 10.4.8 (amazon)
	FreeBSD/32 6.2 (duty)

1 files changed, 4 insertions, 1 deletions

diff --git a/src/H5Apkg.h b/src/H5Apkg.h
index 8d95ce9..f5d843b 100644
--- a/src/H5Apkg.h
+++ b/src/H5Apkg.h
@@ -95,6 +95,9 @@ typedef struct H5A_dense_bt2_corder_rec_t {
     H5O_msg_crt_idx_t corder;           /* 'creation order' field value */
 } H5A_dense_bt2_corder_rec_t;
 
+/* Define the 'found' callback function pointer for matching an attribute record in a v2 B-tree */
+typedef herr_t (*H5A_bt2_found_t)(const H5A_t *attr, hbool_t *took_ownership, void *op_data);
+
 /*
  * Common data exchange structure for dense attribute storage.  This structure
  * is passed through the v2 B-tree layer to the methods for the objects
@@ -110,7 +113,7 @@ typedef struct H5A_bt2_ud_common_t {
     uint32_t    name_hash;              /* Hash of name of attribute to compare */
     uint8_t     flags;                  /* Flags for attribute storage location */
     H5O_msg_crt_idx_t corder;           /* Creation order value of attribute to compare */
-    H5B2_found_t found_op;              /* Callback when correct attribute is found */
+    H5A_bt2_found_t found_op;           /* Callback when correct attribute is found */
     void        *found_op_data;         /* Callback data when correct attribute is found */
 } H5A_bt2_ud_common_t;