From 8de47b212bafa38f73a4ceaadeecfe4b3dd53497 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 31 Jul 2021 11:19:26 +0800 Subject: [PATCH] librbd/crypto/luks: require libcryptsetup v2.0.5 - ubuntu focal ships libcryptsetup-dev (2:2.2.2), - centos 8 app stream comes with cryptsetup-devel-2.3.3. - openSUSE Leap 15.3 packages libcryptsetup-devel-2.3.4 - openSUSE Leap 15.2 packages libcryptsetup-devel-2.0.5 so we can drop the support for libcryptsetup < 2.0.5 see also ea3c1bfb9ef2edcdf572df0cb143c463b7551905 Signed-off-by: Kefu Chai --- CMakeLists.txt | 5 +---- src/include/config-h.in.cmake | 3 --- src/librbd/crypto/luks/Header.cc | 6 +----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e289346112b5..b85c58a2bc282 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,11 +206,8 @@ endif() # libcryptsetup is only available on linux if(WITH_RBD AND LINUX) - find_package(libcryptsetup REQUIRED) + find_package(libcryptsetup 2.0.5 REQUIRED) set(HAVE_LIBCRYPTSETUP ${LIBCRYPTSETUP_FOUND}) - if(${LIBCRYPTSETUP_VERSION} VERSION_LESS 2.0.5) - set(LIBCRYPTSETUP_LEGACY_DATA_ALIGNMENT TRUE) - endif() endif() include(CMakeDependentOption) diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake index a1d89447356d1..224899664faf0 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake @@ -375,9 +375,6 @@ /* Define if PWL-SSD is enabled */ #cmakedefine WITH_RBD_SSD_CACHE -/* Define if libcryptsetup version < 2.0.5 */ -#cmakedefine LIBCRYPTSETUP_LEGACY_DATA_ALIGNMENT - /* Define if libcryptsetup can be used (linux only) */ #cmakedefine HAVE_LIBCRYPTSETUP diff --git a/src/librbd/crypto/luks/Header.cc b/src/librbd/crypto/luks/Header.cc index ee8c8b555240b..b1b8a32d69074 100644 --- a/src/librbd/crypto/luks/Header.cc +++ b/src/librbd/crypto/luks/Header.cc @@ -133,11 +133,7 @@ int Header::format(const char* type, const char* alg, const char* key, struct crypt_params_luks1 luks1params; struct crypt_params_luks2 luks2params; -#ifdef LIBCRYPTSETUP_LEGACY_DATA_ALIGNMENT - size_t converted_data_alignment = data_alignment / sector_size; -#else - size_t converted_data_alignment = data_alignment / 512; -#endif + const size_t converted_data_alignment = data_alignment / 512; void* params = nullptr; if (strcmp(type, CRYPT_LUKS1) == 0) { -- 2.39.5