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

Switch cryptsetup-reencrypt to use tools_reencrypt_progress.

Browse Source
This commit is contained in:
Ondrej Kozina
2019-10-11 11:22:22 +02:00
parent 33f2af1c09
commit 0c8cf5c1e0
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cryptsetup.h
View File

@@ -101,8 +101,6 @@ int tools_is_cipher_null(const char *cipher);
void tools_clear_line(void);
void tools_time_progress(uint64_t device_size, uint64_t bytes,
struct timeval *start_time, struct timeval *end_time);
int tools_wipe_progress(uint64_t size, uint64_t offset, void *usrptr);
int tools_reencrypt_progress(uint64_t size, uint64_t offset, void *usrptr);

19
src/cryptsetup_reencrypt.c
View File

@@ -99,7 +99,6 @@ struct reenc_ctx {
} p[MAX_SLOT];
int keyslot;
struct timeval start_time, end_time;
uint64_t resume_bytes;
};
@@ -937,6 +936,8 @@ static int copy_data_forward(struct reenc_ctx *rc, int fd_old, int fd_new,
rc->resume_bytes = *bytes = rc->device_offset;
tools_reencrypt_progress(rc->device_size, *bytes, NULL);
if (write_log(rc) < 0)
return -EIO;
@@ -970,8 +971,8 @@ static int copy_data_forward(struct reenc_ctx *rc, int fd_old, int fd_new,
}
*bytes += (uint64_t)s2;
tools_time_progress(rc->device_size, *bytes,
&rc->start_time, &rc->end_time);
tools_reencrypt_progress(rc->device_size, *bytes, NULL);
}
return quit ? -EAGAIN : 0;
@@ -994,6 +995,8 @@ static int copy_data_backward(struct reenc_ctx *rc, int fd_old, int fd_new,
*bytes = rc->resume_bytes;
}
tools_reencrypt_progress(rc->device_size, *bytes, NULL);
if (write_log(rc) < 0)
return -EIO;
@@ -1039,8 +1042,8 @@ static int copy_data_backward(struct reenc_ctx *rc, int fd_old, int fd_new,
}
*bytes += (uint64_t)s2;
tools_time_progress(rc->device_size, *bytes,
&rc->start_time, &rc->end_time);
tools_reencrypt_progress(rc->device_size, *bytes, NULL);
}
return quit ? -EAGAIN : 0;
@@ -1127,8 +1130,6 @@ static int copy_data(struct reenc_ctx *rc)
}
set_int_handler(0);
tools_time_progress(rc->device_size, bytes,
&rc->start_time, &rc->end_time);
if (rc->reencrypt_direction == FORWARD)
r = copy_data_forward(rc, fd_old, fd_new, block_size, buf, &bytes);
@@ -1145,9 +1146,7 @@ static int copy_data(struct reenc_ctx *rc)
set_int_block(1);
if (r == -EAGAIN)
log_err(_("Interrupted by a signal."));
else if (r < 0)
if (r < 0 && r != -EAGAIN)
log_err(_("IO error during reencryption."));
(void)write_log(rc);

2
src/utils_tools.c
View File

@@ -380,7 +380,7 @@ void tools_clear_line(void)
log_std("\33[2K\r");
}
void tools_time_progress(uint64_t device_size, uint64_t bytes,
static void tools_time_progress(uint64_t device_size, uint64_t bytes,
struct timeval *start_time, struct timeval *end_time)
{
struct timeval now_time;