From f5bbc499d42180b04988bc52ee14105408ff6b32 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Tue, 29 Apr 2025 12:11:49 +0200 Subject: [PATCH] Move LUKS_STRIPES definition to macros definitions. To be used in repair code later. --- lib/libcryptsetup_macros.h | 5 +++++ lib/luks2/luks2_json_metadata.c | 2 -- lib/luks2/luks2_keyslot_luks2.c | 1 - 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libcryptsetup_macros.h b/lib/libcryptsetup_macros.h index 6d8678dc..657c48f8 100644 --- a/lib/libcryptsetup_macros.h +++ b/lib/libcryptsetup_macros.h @@ -57,4 +57,9 @@ #define OPAL_PSID_LEN 32 +/* LUKS AF stripes, never set to any other value than 4000 */ +#ifndef LUKS_STRIPES +# define LUKS_STRIPES 4000 +#endif + #endif /* _LIBCRYPTSETUP_MACROS_H */ diff --git a/lib/luks2/luks2_json_metadata.c b/lib/luks2/luks2_json_metadata.c index f01119c7..12114882 100644 --- a/lib/luks2/luks2_json_metadata.c +++ b/lib/luks2/luks2_json_metadata.c @@ -13,8 +13,6 @@ #include #include -#define LUKS_STRIPES 4000 - struct interval { uint64_t offset; uint64_t length; diff --git a/lib/luks2/luks2_keyslot_luks2.c b/lib/luks2/luks2_keyslot_luks2.c index a20fa186..bb9ebee5 100644 --- a/lib/luks2/luks2_keyslot_luks2.c +++ b/lib/luks2/luks2_keyslot_luks2.c @@ -14,7 +14,6 @@ #define LUKS_SALTSIZE 32 #define LUKS_SLOT_ITERATIONS_MIN 1000 -#define LUKS_STRIPES 4000 /* Serialize memory-hard keyslot access: optional workaround for parallel processing */ #define MIN_MEMORY_FOR_SERIALIZE_LOCK_KB 32*1024 /* 32MB */