eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-07 08:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Minor code refactoring in reencryption loop.

Browse Source
This commit is contained in:
Ondrej Kozina
2022-06-06 13:52:17 +02:00
parent 97b88d878e
commit 4de09ace8f
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/luks2/luks2_reencrypt.c
View File

@@ -3183,6 +3183,12 @@ static reenc_status_t reencrypt_step(struct crypt_device *cd,
bool online) bool online)
{ {
int r; int r;
struct reenc_protection *rp;
assert(hdr);
assert(rh);
rp = &rh->rp;
/* in memory only */ /* in memory only */
r = reencrypt_make_segments(cd, hdr, rh, device_size); r = reencrypt_make_segments(cd, hdr, rh, device_size);
@@ -3198,7 +3204,7 @@ static reenc_status_t reencrypt_step(struct crypt_device *cd,
log_dbg(cd, "Reencrypting chunk starting at offset: %" PRIu64 ", size :%" PRIu64 ".", rh->offset, rh->length); log_dbg(cd, "Reencrypting chunk starting at offset: %" PRIu64 ", size :%" PRIu64 ".", rh->offset, rh->length);
log_dbg(cd, "data_offset: %" PRIu64, crypt_get_data_offset(cd) << SECTOR_SHIFT); log_dbg(cd, "data_offset: %" PRIu64, crypt_get_data_offset(cd) << SECTOR_SHIFT);
if (!rh->offset && rh->mode == CRYPT_REENCRYPT_ENCRYPT && rh->rp.type == REENC_PROTECTION_DATASHIFT && if (!rh->offset && rh->mode == CRYPT_REENCRYPT_ENCRYPT && rp->type == REENC_PROTECTION_DATASHIFT &&
rh->jobj_segment_moved) { rh->jobj_segment_moved) {
crypt_storage_wrapper_destroy(rh->cw1); crypt_storage_wrapper_destroy(rh->cw1);
log_dbg(cd, "Reinitializing old segment storage wrapper for moved segment."); log_dbg(cd, "Reinitializing old segment storage wrapper for moved segment.");
@@ -3230,7 +3236,7 @@ static reenc_status_t reencrypt_step(struct crypt_device *cd,
} }
/* metadata commit point */ /* metadata commit point */
r = reencrypt_hotzone_protect_final(cd, hdr, rh->reenc_keyslot, &rh->rp, rh->reenc_buffer, rh->read); r = reencrypt_hotzone_protect_final(cd, hdr, rh->reenc_keyslot, rp, rh->reenc_buffer, rh->read);
if (r < 0) { if (r < 0) {
/* severity normal */ /* severity normal */
log_err(cd, _("Failed to write reencryption resilience metadata.")); log_err(cd, _("Failed to write reencryption resilience metadata."));
@@ -3249,13 +3255,13 @@ static reenc_status_t reencrypt_step(struct crypt_device *cd,
return REENC_FATAL; return REENC_FATAL;
} }
if (rh->rp.type != REENC_PROTECTION_NONE && crypt_storage_wrapper_datasync(rh->cw2)) { if (rp->type != REENC_PROTECTION_NONE && crypt_storage_wrapper_datasync(rh->cw2)) {
log_err(cd, _("Failed to sync data.")); log_err(cd, _("Failed to sync data."));
return REENC_FATAL; return REENC_FATAL;
} }
/* metadata commit safe point */ /* metadata commit safe point */
r = reencrypt_assign_segments(cd, hdr, rh, 0, rh->rp.type != REENC_PROTECTION_NONE); r = reencrypt_assign_segments(cd, hdr, rh, 0, rp->type != REENC_PROTECTION_NONE);
if (r) { if (r) {
/* severity fatal */ /* severity fatal */
log_err(cd, _("Failed to update metadata after current reencryption hotzone completed.")); log_err(cd, _("Failed to update metadata after current reencryption hotzone completed."));