import quincy beta 17.1.0

[ceph.git] / ceph / src / librbd / crypto / luks / Header.cc

diff --git a/ceph/src/librbd/crypto/luks/Header.cc b/ceph/src/librbd/crypto/luks/Header.cc
index 6d00074efcf80157b98bb28f25019f44dade1104..b1b8a32d69074a52037477e960127380cfd4bf0c 100644 (file)
--- a/ceph/src/librbd/crypto/luks/Header.cc
+++ b/ceph/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) {
@@ -183,7 +179,7 @@ int Header::add_keyslot(const char* passphrase, size_t passphrase_size) {
 
   auto r = crypt_keyslot_add_by_volume_key(
           m_cd, CRYPT_ANY_SLOT, NULL, 0, passphrase, passphrase_size);
-  if (r != 0) {
+  if (r < 0) {
     lderr(m_cct) << "crypt_keyslot_add_by_volume_key failed: "
                  << cpp_strerror(r) << dendl;
     return r;
@@ -222,7 +218,7 @@ int Header::read_volume_key(const char* passphrase, size_t passphrase_size,
   auto r = crypt_volume_key_get(
           m_cd, CRYPT_ANY_SLOT, volume_key, volume_key_size, passphrase,
           passphrase_size);
-  if (r != 0) {
+  if (r < 0) {
     lderr(m_cct) << "crypt_volume_key_get failed: " << cpp_strerror(r)
                  << dendl;
     return r;