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

Use resume instead of restart.

Browse Source
This commit is contained in:
Milan Broz
2012-06-27 21:28:11 +02:00
parent 9b455125e9
commit b99b4825a2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/cryptsetup_reencrypt.c
View File

@@ -105,7 +105,7 @@ struct reenc_ctx {
int keyslot; int keyslot;
struct timeval start_time, end_time; struct timeval start_time, end_time;
uint64_t restart_bytes; uint64_t resume_bytes;
}; };
char MAGIC[] = {'L','U','K','S', 0xba, 0xbe}; char MAGIC[] = {'L','U','K','S', 0xba, 0xbe};
@@ -455,7 +455,7 @@ static int open_log(struct reenc_ctx *rc)
if (rc->log_fd == -1) if (rc->log_fd == -1)
return -EINVAL; return -EINVAL;
} else { } else {
log_std(_("Log file %s exists, restarting reencryption.\n"), rc->log_file); log_std(_("Log file %s exists, resuming reencryption.\n"), rc->log_file);
flags = opt_directio ? O_RDWR|O_DIRECT : O_RDWR; flags = opt_directio ? O_RDWR|O_DIRECT : O_RDWR;
rc->log_fd = open(rc->log_file, flags); rc->log_fd = open(rc->log_file, flags);
if (rc->log_fd == -1) if (rc->log_fd == -1)
@@ -714,7 +714,7 @@ static void print_progress(struct reenc_ctx *rc, uint64_t bytes, int final)
if (!tdiff) if (!tdiff)
return; return;
mbytes = (bytes - rc->restart_bytes) / 1024 / 1024; mbytes = (bytes - rc->resume_bytes) / 1024 / 1024;
mib = (double)(mbytes) / tdiff; mib = (double)(mbytes) / tdiff;
if (!mib) if (!mib)
return; return;
@@ -743,7 +743,7 @@ static int copy_data_forward(struct reenc_ctx *rc, int fd_old, int fd_new,
return -EIO; return -EIO;
} }
rc->restart_bytes = *bytes = rc->device_offset; rc->resume_bytes = *bytes = rc->device_offset;
if (write_log(rc) < 0) if (write_log(rc) < 0)
return -EIO; return -EIO;
@@ -794,11 +794,11 @@ static int copy_data_backward(struct reenc_ctx *rc, int fd_old, int fd_new,
if (!rc->in_progress) { if (!rc->in_progress) {
rc->device_offset = rc->device_size; rc->device_offset = rc->device_size;
rc->restart_bytes = 0; rc->resume_bytes = 0;
*bytes = 0; *bytes = 0;
} else { } else {
rc->restart_bytes = rc->device_size - rc->device_offset; rc->resume_bytes = rc->device_size - rc->device_offset;
*bytes = rc->restart_bytes; *bytes = rc->resume_bytes;
} }
if (write_log(rc) < 0) if (write_log(rc) < 0)
@@ -1298,7 +1298,7 @@ int main(int argc, const char **argv)
if (opt_bsize < 1 || opt_bsize > 64) if (opt_bsize < 1 || opt_bsize > 64)
usage(popt_context, EXIT_FAILURE, usage(popt_context, EXIT_FAILURE,
_("Only values between 1MiB and 64 MiB allowed for reencryption block size."), _("Only values between 1 MiB and 64 MiB allowed for reencryption block size."),
poptGetInvocationName(popt_context)); poptGetInvocationName(popt_context));
if (opt_key_size % 8) if (opt_key_size % 8)