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

Remove unused parameter from reencrypt_swap_backing_device.

Browse Source 
It always loads dm-linear mapping in original device that maps 1:1
to helper overlay device (holding original table).
This commit is contained in:
Ondrej Kozina
2019-09-23 14:57:47 +02:00
parent 9c38e09ad3
commit 8714e115ad
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/luks2/luks2_reencrypt.c
View File

@@ -1869,15 +1869,12 @@ err:
} }
static int reencrypt_swap_backing_device(struct crypt_device *cd, const char *name, static int reencrypt_swap_backing_device(struct crypt_device *cd, const char *name,
const char *new_backend_name, uint32_t flags) const char *new_backend_name)
{ {
int r; int r;
struct device *overlay_dev = NULL; struct device *overlay_dev = NULL;
char overlay_path[PATH_MAX] = { 0 }; char overlay_path[PATH_MAX] = { 0 };
struct crypt_dm_active_device dmd = {};
struct crypt_dm_active_device dmd = {
.flags = flags,
};
log_dbg(cd, "Redirecting %s mapping to new backing device: %s.", name, new_backend_name); log_dbg(cd, "Redirecting %s mapping to new backing device: %s.", name, new_backend_name);
@@ -1972,7 +1969,7 @@ static int reencrypt_init_device_stack(struct crypt_device *cd,
} }
/* swap origin mapping to overlay device */ /* swap origin mapping to overlay device */
r = reencrypt_swap_backing_device(cd, rh->device_name, rh->overlay_name, CRYPT_ACTIVATE_KEYRING_KEY); r = reencrypt_swap_backing_device(cd, rh->device_name, rh->overlay_name);
if (r) { if (r) {
log_err(cd, _("Failed to load new mapping for device %s."), rh->device_name); log_err(cd, _("Failed to load new mapping for device %s."), rh->device_name);
goto err; goto err;