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

Move device_block_adjust() check lower in code.

Browse Source
This commit is contained in:
Ondrej Kozina
2018-12-10 17:07:12 +01:00
committed by Milan Broz
parent 675cf7ef59
commit 5c0ad86f19
3 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/setup.c
View File

@@ -483,8 +483,6 @@ int PLAIN_activate(struct crypt_device *cd,
uint64_t size,
uint32_t flags)
{
int r;
enum devcheck device_check;
struct crypt_dm_active_device dmd = {
.target = DM_CRYPT,
.size = size,
@@ -499,22 +497,10 @@ int PLAIN_activate(struct crypt_device *cd,
}
};
if (dmd.flags & CRYPT_ACTIVATE_SHARED)
device_check = DEV_SHARED;
else
device_check = DEV_EXCL;
r = device_block_adjust(cd, dmd.data_device, device_check,
dmd.u.crypt.offset, &dmd.size, &dmd.flags);
if (r)
return r;
log_dbg(cd, "Trying to activate PLAIN device %s using cipher %s.",
name, dmd.u.crypt.cipher);
r = create_or_reload_device(cd, name, CRYPT_PLAIN, &dmd);
return r;
return create_or_reload_device(cd, name, CRYPT_PLAIN, &dmd);
}
int crypt_confirm(struct crypt_device *cd, const char *msg)