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 <kchai@redhat.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e289346112b52a736c30a2fa0247e7e25290acd..b85c58a2bc282f054670a68b52ac1cc361adc8fa 100644 (file)
--- 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 a1d89447356d187119b9336fe7e6f86d881ec460..224899664faf04e3bb9d993343b086b270908202 100644 (file)
--- 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 ee8c8b555240bc0859e98e253b215ddcf6f4eeb6..b1b8a32d69074a52037477e960127380cfd4bf0c 100644 (file)
--- 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) {