From d42de626b604b75963fd593a145fd9c9b9e20602 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 27 Aug 2019 07:03:51 -0700 Subject: Fixed a bug where we incorrectly pass a lock struct to fcntl for file locking instead of a pointer. --- src/H5system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/H5system.c b/src/H5system.c index 1d47d13..384360d 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -631,7 +631,7 @@ Pflock(int fd, int operation) { flk.l_pid = 0; /* not used with set */ /* Lock or unlock */ - if(HDfcntl(fd, F_SETLK, flk) < 0) + if(HDfcntl(fd, F_SETLK, &flk) < 0) return -1; return 0; -- cgit v0.12 From 9a4f86997ad160bcc8a3f9eefdbd92d4a63e14c6 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 27 Aug 2019 12:20:12 -0700 Subject: Fixed typo from HD changes --- testpar/t_cache_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index 08d455d..e0c8211 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -4155,7 +4155,7 @@ main(int argc, char **argv) if ( serial_insert_cache_image(file_idx, mpi_size) ) { - HD exit(0); + HDexit(0); } else { -- cgit v0.12 From 7dfe1769248d7f05ded66b4c6b78cb0be5ebee52 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Tue, 27 Aug 2019 13:26:22 -0700 Subject: Fixed a bug in the cache image code that was introduced by the HD changes. --- testpar/t_cache_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testpar/t_cache_image.c b/testpar/t_cache_image.c index e0c8211..14e3d10 100644 --- a/testpar/t_cache_image.c +++ b/testpar/t_cache_image.c @@ -1187,7 +1187,7 @@ open_hdf5_file(const hbool_t create_file, } else { - file_ptr = (struct H5F_t *)H5I_object_verify(file_id, H5I_FILE); + file_ptr = (struct H5F_t *)H5VL_object_verify(file_id, H5I_FILE); if ( file_ptr == NULL ) { -- cgit v0.12