From 50c7364ef6387663c47c6075a601a121260dd738 Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Thu, 21 Nov 2024 16:54:07 +0100 Subject: [PATCH] Fix last commit which was broken on Linux. --- cmake/QuickCppLibBootstrap.cmake | 2 +- include/llfio/revision.hpp | 6 +++--- include/llfio/v2.0/detail/impl/posix/file_handle.ipp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/QuickCppLibBootstrap.cmake b/cmake/QuickCppLibBootstrap.cmake index 2b68a134f..b8357af4d 100644 --- a/cmake/QuickCppLibBootstrap.cmake +++ b/cmake/QuickCppLibBootstrap.cmake @@ -28,7 +28,7 @@ foreach(item ${CMAKE_MODULE_PATH}) set(quickcpplib_done ON) endif() endforeach() -if(NOT quickcpplib_done) +if(NOT quickcpplib_done AND quickcpplib_DIR) find_package(quickcpplib QUIET CONFIG) if(quickcpplib_FOUND) if(DEFINED quickcpplib_CMAKELIB_DIR AND DEFINED quickcpplib_SCRIPTS_DIR) diff --git a/include/llfio/revision.hpp b/include/llfio/revision.hpp index da470105e..7bd51964b 100644 --- a/include/llfio/revision.hpp +++ b/include/llfio/revision.hpp @@ -1,4 +1,4 @@ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define LLFIO_PREVIOUS_COMMIT_REF 931ad7b294ce852e577076630c445e2e930dae17 -#define LLFIO_PREVIOUS_COMMIT_DATE "2024-11-18 14:44:33 +00:00" -#define LLFIO_PREVIOUS_COMMIT_UNIQUE 931ad7b2 +#define LLFIO_PREVIOUS_COMMIT_REF 27d96a8af49cb169c7cd03638b2e0365dc1c1014 +#define LLFIO_PREVIOUS_COMMIT_DATE "2024-11-19 15:12:17 +00:00" +#define LLFIO_PREVIOUS_COMMIT_UNIQUE 27d96a8a diff --git a/include/llfio/v2.0/detail/impl/posix/file_handle.ipp b/include/llfio/v2.0/detail/impl/posix/file_handle.ipp index c3e7044b3..48681e012 100644 --- a/include/llfio/v2.0/detail/impl/posix/file_handle.ipp +++ b/include/llfio/v2.0/detail/impl/posix/file_handle.ipp @@ -994,7 +994,7 @@ result file_handle::zero(file_handle::extent_pair exte if(-1 != fallocate(_v.fd, 0x02 /*FALLOC_FL_PUNCH_HOLE*/ | 0x01 /*FALLOC_FL_KEEP_SIZE*/, extent.offset, extent.length)) { // Success - return extent; + return extent.length; } // The filing system may not support trim if(EOPNOTSUPP != errno)