From d95472e7578ce765116d8d7b9ac97f706ff3e1e0 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sat, 4 Jul 2020 12:23:07 +0200 Subject: [PATCH] Rename LUKS2_reencrypt_status to LUKS2_reencrypt_get_params to avoid confusion. --- lib/luks2/luks2.h | 2 +- lib/luks2/luks2_reencrypt.c | 4 ++-- lib/setup.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/luks2/luks2.h b/lib/luks2/luks2.h index a6046b40..bf2e4c2a 100644 --- a/lib/luks2/luks2.h +++ b/lib/luks2/luks2.h @@ -419,7 +419,7 @@ int LUKS2_reencrypt_locked_recovery_by_passphrase(struct crypt_device *cd, void LUKS2_reencrypt_free(struct crypt_device *cd, struct luks2_reenc_context *rh); -crypt_reencrypt_info LUKS2_reencrypt_status(struct crypt_device *cd, +crypt_reencrypt_info LUKS2_reencrypt_get_params(struct luks2_hdr *hdr, struct crypt_params_reencrypt *params); int LUKS2_reencrypt_lock(struct crypt_device *cd, diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c index 538ed6bd..67ca5b71 100644 --- a/lib/luks2/luks2_reencrypt.c +++ b/lib/luks2/luks2_reencrypt.c @@ -3530,10 +3530,10 @@ err: return r < 0 ? r : keyslot; } -crypt_reencrypt_info LUKS2_reencrypt_status(struct crypt_device *cd, struct crypt_params_reencrypt *params) +crypt_reencrypt_info LUKS2_reencrypt_get_params(struct luks2_hdr *hdr, + struct crypt_params_reencrypt *params) { crypt_reencrypt_info ri; - struct luks2_hdr *hdr = crypt_get_hdr(cd, CRYPT_LUKS2); ri = LUKS2_reenc_status(hdr); if (ri == CRYPT_REENCRYPT_NONE || ri == CRYPT_REENCRYPT_INVALID || !params) diff --git a/lib/setup.c b/lib/setup.c index 5769d435..3b176cfa 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -6039,7 +6039,7 @@ crypt_reencrypt_info crypt_reencrypt_status(struct crypt_device *cd, if (_onlyLUKS2(cd, CRYPT_CD_QUIET, CRYPT_REQUIREMENT_ONLINE_REENCRYPT)) return CRYPT_REENCRYPT_INVALID; - return LUKS2_reencrypt_status(cd, params); + return LUKS2_reencrypt_get_params(&cd->u.luks2.hdr, params); } static void __attribute__((destructor)) libcryptsetup_exit(void)