[svn-r15801] Description:

	Bring r15800 back from trunk:

		- File free space branch changes through r15794

Tested on:
        Mac OS X/32 10.5.5 (amazon) in debug mode
        Mac OS X/32 10.5.5 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode
        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

1 files changed, 12 insertions, 4 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index 219fe4d..f1d905d 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -831,7 +831,9 @@ done:
  *
  * Modifications:
  *
- *		None.
+ *		Added 'flags' paramater, to allow freeing file space
+ *
+ *						    QAK - 2/5/08
  *
  *-------------------------------------------------------------------------
  */
@@ -839,15 +841,16 @@ herr_t
 H5AC_expunge_entry(H5F_t *f,
 		   hid_t dxpl_id,
 		   const H5AC_class_t *type,
-		   haddr_t addr)
+		   haddr_t addr,
+                   unsigned flags)
 {
     herr_t   result;
-    herr_t   ret_value=SUCCEED;      /* Return value */
     H5AC_t * cache_ptr = NULL;
 #if H5AC__TRACE_FILE_ENABLED
     char                trace[128] = "";
     FILE *              trace_file_ptr = NULL;
 #endif /* H5AC__TRACE_FILE_ENABLED */
+    herr_t   ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(H5AC_expunge_entry, FAIL)
 
@@ -881,7 +884,8 @@ H5AC_expunge_entry(H5F_t *f,
                                H5AC_noblock_dxpl_id,
                                cache_ptr,
                                type,
-                               addr);
+                               addr,
+                               flags);
 
     if ( result < 0 ) {
 
@@ -1280,6 +1284,10 @@ H5AC_set(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr, void *
     HDassert(H5F_addr_defined(addr));
     HDassert(thing);
 
+    /* Check for invalid access request */
+    if(0 == (f->intent & H5F_ACC_RDWR))
+	HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, FAIL, "no write intent on file")
+
 #if H5AC__TRACE_FILE_ENABLED
     /* For the insert, only the addr, size, type id and flags are really
      * necessary in the trace file.  Write the result to catch occult