eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-16 21:29:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Do not callback progress twice in reencryption loop.

Browse Source
This commit is contained in:
Ondrej Kozina
2019-07-17 14:10:37 +02:00
parent 4a24311161
commit e8e1da3fb5
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/luks2/luks2_reencrypt.c
View File

@@ -3107,14 +3107,15 @@ static void _reencrypt_teardown_fatal(struct crypt_device *cd, struct luks2_hdr
} }
} }
static int _reencrypt_free(struct crypt_device *cd, struct luks2_hdr *hdr, struct luks2_reenc_context *rh, reenc_status_t rs, static int _reencrypt_free(struct crypt_device *cd, struct luks2_hdr *hdr,
struct luks2_reenc_context *rh, reenc_status_t rs, bool interrupted,
int (*progress)(uint64_t size, uint64_t offset, void *usrptr)) int (*progress)(uint64_t size, uint64_t offset, void *usrptr))
{ {
int r; int r;
switch (rs) { switch (rs) {
case REENC_OK: case REENC_OK:
if (progress) if (progress && !interrupted)
progress(rh->device_size, rh->progress, NULL); progress(rh->device_size, rh->progress, NULL);
r = _reencrypt_teardown_ok(cd, hdr, rh); r = _reencrypt_teardown_ok(cd, hdr, rh);
break; break;
@@ -3178,8 +3179,6 @@ int crypt_reencrypt(struct crypt_device *cd,
} }
log_dbg(cd, "Progress %" PRIu64 ", device_size %" PRIu64, rh->progress, rh->device_size); log_dbg(cd, "Progress %" PRIu64 ", device_size %" PRIu64, rh->progress, rh->device_size);
if (progress && progress(rh->device_size, rh->progress, NULL))
quit = true;
rs = REENC_OK; rs = REENC_OK;
@@ -3203,7 +3202,7 @@ int crypt_reencrypt(struct crypt_device *cd,
log_dbg(cd, "Next reencryption chunk size will be %" PRIu64 " sectors).", rh->length); log_dbg(cd, "Next reencryption chunk size will be %" PRIu64 " sectors).", rh->length);
} }
r = _reencrypt_free(cd, hdr, rh, rs, progress); r = _reencrypt_free(cd, hdr, rh, rs, quit, progress);
device_release_excl(cd, crypt_data_device(cd)); device_release_excl(cd, crypt_data_device(cd));
return r; return r;
} }