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

libcrypsetup: add CRYPT_DEACTIVATE_DEFERRED_CANCEL for crypt_deactivate_by_name

Browse Source 
Allows to cancel a previously set deferred deactivation flag
for a specific device.

[mbroz: slight changes]
This commit is contained in:
Luca Boccassi
2020-07-15 15:35:19 +01:00
committed by Milan Broz
parent dcc2b252dd
commit 3062a9ba91
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libcryptsetup.h
View File

@@ -1351,6 +1351,8 @@ int crypt_activate_by_keyring(struct crypt_device *cd,
#define CRYPT_DEACTIVATE_DEFERRED (1 << 0)
/** force deactivation - if the device is busy, it is replaced by error device */
#define CRYPT_DEACTIVATE_FORCE (1 << 1)
/** if set, remove lazy deactivation */
#define CRYPT_DEACTIVATE_DEFERRED_CANCEL (1 << 2)
/**
* Deactivate crypt device. This function tries to remove active device-mapper

5
lib/libdevmapper.c
View File

@@ -2942,6 +2942,11 @@ out:
return r;
}
int dm_cancel_deferred_removal(const char *name)
{
return _dm_message(name, "@cancel_deferred_remove") ? 0 : -ENOTSUP;
}
const char *dm_get_dir(void)
{
return dm_dir();

12
lib/setup.c
View File

@@ -4474,6 +4474,9 @@ int crypt_deactivate_by_name(struct crypt_device *cd, const char *name, uint32_t
if (!name)
return -EINVAL;
if ((flags & CRYPT_DEACTIVATE_DEFERRED) && (flags & CRYPT_DEACTIVATE_DEFERRED_CANCEL))
return -EINVAL;
log_dbg(cd, "Deactivating volume %s.", name);
if (!cd) {
@@ -4484,12 +4487,19 @@ int crypt_deactivate_by_name(struct crypt_device *cd, const char *name, uint32_t
}
/* skip holders detection and early abort when some flags raised */
if (flags & (CRYPT_DEACTIVATE_FORCE | CRYPT_DEACTIVATE_DEFERRED))
if (flags & (CRYPT_DEACTIVATE_FORCE | CRYPT_DEACTIVATE_DEFERRED | CRYPT_DEACTIVATE_DEFERRED_CANCEL))
get_flags &= ~DM_ACTIVE_HOLDERS;
switch (crypt_status(cd, name)) {
case CRYPT_ACTIVE:
case CRYPT_BUSY:
if (flags & CRYPT_DEACTIVATE_DEFERRED_CANCEL) {
r = dm_cancel_deferred_removal(name);
if (r < 0)
log_err(cd, _("Could not cancel deferred remove from device %s."), name);
break;
}
r = dm_query_device(cd, name, get_flags, &dmd);
if (r >= 0) {
if (dmd.holders) {

1
lib/utils_dm.h
View File

@@ -220,6 +220,7 @@ int dm_resume_and_reinstate_key(struct crypt_device *cd, const char *name,
const struct volume_key *vk);
int dm_error_device(struct crypt_device *cd, const char *name);
int dm_clear_device(struct crypt_device *cd, const char *name);
int dm_cancel_deferred_removal(const char *name);
const char *dm_get_dir(void);