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

Add context to device handling functions.

Browse Source
This commit is contained in:
Milan Broz
2018-11-27 14:19:57 +01:00
parent a5a8467993
commit 7812214db6
16 changed files with 180 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/utils_wipe.c
View File

@@ -145,7 +145,7 @@ int crypt_wipe_device(struct crypt_device *cd,
bool need_block_init = true;
/* Note: LUKS1 calls it with wipe_block not aligned to multiple of bsize */
bsize = device_block_size(device);
bsize = device_block_size(cd, device);
alignment = device_alignment(device);
if (!bsize || !alignment || !wipe_block_size)
return -EINVAL;
@@ -156,7 +156,7 @@ int crypt_wipe_device(struct crypt_device *cd,
if (MISALIGNED_512(offset) || MISALIGNED_512(length) || MISALIGNED_512(wipe_block_size))
return -EINVAL;
devfd = device_open(device, O_RDWR);
devfd = device_open(cd, device, O_RDWR);
if (devfd < 0)
return errno ? -errno : -EINVAL;
@@ -216,7 +216,7 @@ int crypt_wipe_device(struct crypt_device *cd,
}
}
device_sync(device, devfd);
device_sync(cd, device, devfd);
out:
close(devfd);
free(sf);
@@ -260,7 +260,7 @@ int crypt_wipe(struct crypt_device *cd,
wipe_block_size, progress, usrptr);
if (dev_path)
device_free(device);
device_free(cd, device);
return r;
}