[svn-r19672] Description:

	Make certain that the SWMR read & write file access flags get passed to
externally linked file.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) 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, w/threadsafe, in production mode
        Linux/PPC 2.6 (heiwa) w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.4 (amazon) in debug mode
        Mac OS X/32 10.6.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode
        Mac OS X/32 10.6.4 (amazon) w/parallel, in debug mode

2 files changed, 70 insertions, 1 deletions

diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index 9cab8cf..9880897 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -310,7 +310,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
      */
 
     /* Simplify intent flags for open calls */
-    intent = ((intent & H5F_ACC_RDWR) ? H5F_ACC_RDWR : H5F_ACC_RDONLY);
+    intent &= (H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE | H5F_ACC_SWMR_READ);
 
     /* Copy the file name to use */
     if(NULL == (temp_file_name = H5MM_strdup(file_name)))
diff --git a/test/links.c b/test/links.c
index 3596f1f..f96ed83 100644
--- a/test/links.c
+++ b/test/links.c
@@ -4106,6 +4106,75 @@ external_set_elink_acc_flags(hid_t fapl, hbool_t new_format)
     if(H5Gclose(group) < 0) TEST_ERROR
     if(H5Fclose(file1) < 0) TEST_ERROR
 
+
+    /* Reopen file1, with read-write and SWMR-write access */
+    if((file1 = H5Fopen(filename1, H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE, fapl)) < 0) FAIL_STACK_ERROR
+
+    /* Open a group through the external link using default gapl */
+    if((group = H5Gopen2(file1, "/ext_link/group", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+
+    /* Verify that the correct parameters have been set on file2 */
+    if((file2 = H5Iget_file_id(group)) < 0) FAIL_STACK_ERROR
+    if(H5Fget_intent(file2, &flags) < 0) FAIL_STACK_ERROR
+    if(flags != (H5F_ACC_RDWR | H5F_ACC_SWMR_WRITE)) TEST_ERROR
+
+    /* Close file2 and group */
+    if(H5Gclose(group) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+
+    /* Set elink access flags on gapl to be H5F_ACC_RDWR (dropping SWMR_WRITE) */
+    if(H5Pset_elink_acc_flags(gapl, H5F_ACC_RDWR) < 0) FAIL_STACK_ERROR
+
+    /* Open a group through the external link using gapl */
+    if((group = H5Gopen2(file1, "/ext_link/group", gapl)) < 0) FAIL_STACK_ERROR
+
+    /* Verify that the correct parameters have been set on file2 */
+    if((file2 = H5Iget_file_id(group)) < 0) FAIL_STACK_ERROR
+    if(H5Fget_intent(file2, &flags) < 0) FAIL_STACK_ERROR
+    if(flags != H5F_ACC_RDWR) TEST_ERROR
+
+    /* Close file2 and group */
+    if(H5Gclose(group) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+
+    /* Close file1 */
+    if(H5Fclose(file1) < 0) TEST_ERROR
+
+
+    /* Reopen file1, with read-only and SWMR-read access */
+    if((file1 = H5Fopen(filename1, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, fapl)) < 0) FAIL_STACK_ERROR
+
+    /* Open a group through the external link using default gapl */
+    if((group = H5Gopen2(file1, "/ext_link/group", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+
+    /* Verify that the correct parameters have been set on file2 */
+    if((file2 = H5Iget_file_id(group)) < 0) FAIL_STACK_ERROR
+    if(H5Fget_intent(file2, &flags) < 0) FAIL_STACK_ERROR
+    if(flags != (H5F_ACC_RDONLY | H5F_ACC_SWMR_READ)) TEST_ERROR
+
+    /* Close file2 and group */
+    if(H5Gclose(group) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+
+    /* Set elink access flags on gapl to be H5F_ACC_RDWR (dropping SWMR_WRITE) */
+    if(H5Pset_elink_acc_flags(gapl, H5F_ACC_RDONLY) < 0) FAIL_STACK_ERROR
+
+    /* Open a group through the external link using gapl */
+    if((group = H5Gopen2(file1, "/ext_link/group", gapl)) < 0) FAIL_STACK_ERROR
+
+    /* Verify that the correct parameters have been set on file2 */
+    if((file2 = H5Iget_file_id(group)) < 0) FAIL_STACK_ERROR
+    if(H5Fget_intent(file2, &flags) < 0) FAIL_STACK_ERROR
+    if(flags != H5F_ACC_RDONLY) TEST_ERROR
+
+    /* Close file2 and group */
+    if(H5Gclose(group) < 0) FAIL_STACK_ERROR
+    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+
+    /* Close file1 */
+    if(H5Fclose(file1) < 0) TEST_ERROR
+
+
     /* Verify that H5Fcreate and H5Fopen reject H5F_ACC_DEFAULT */
     H5E_BEGIN_TRY {
         file1 = H5Fcreate(filename1, H5F_ACC_DEFAULT, H5P_DEFAULT, fapl);