diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-03-24 13:50:50 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2022-03-24 16:19:48 +0100 |
| commit | 3f2ada89f3a277625390bf6789ccd4e7aba08743 (patch) | |
| tree | 60e1d90242675275354e9e0cfabb14e10e2186a9 /src/home/homework-luks.c | |
| parent | 4029328014be9350ca9fc0774ad936c8b5e50ff2 (diff) | |
| download | systemd-3f2ada89f3a277625390bf6789ccd4e7aba08743.tar.gz | |
errno-util: add ERRNO_IS_DEVICE_ABSENT() macro
Inspired by: https://github.com/systemd/systemd/pull/22717#discussion_r834254495
Diffstat (limited to 'src/home/homework-luks.c')
| -rw-r--r-- | src/home/homework-luks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/home/homework-luks.c b/src/home/homework-luks.c index 488cb30fe3..5416d12fcf 100644 --- a/src/home/homework-luks.c +++ b/src/home/homework-luks.c @@ -495,7 +495,7 @@ static int acquire_open_luks_device( return r; r = sym_crypt_init_by_name(&cd, setup->dm_name); - if (IN_SET(r, -ENODEV, -EINVAL, -ENOENT) && graceful) + if ((ERRNO_IS_DEVICE_ABSENT(r) || r == -EINVAL) && graceful) return 0; if (r < 0) return log_error_errno(r, "Failed to initialize cryptsetup context for %s: %m", setup->dm_name); @@ -1631,7 +1631,7 @@ int home_deactivate_luks(UserRecord *h, HomeSetup *setup) { cryptsetup_enable_logging(setup->crypt_device); r = sym_crypt_deactivate_by_name(setup->crypt_device, setup->dm_name, 0); - if (IN_SET(r, -ENODEV, -EINVAL, -ENOENT)) { + if (ERRNO_IS_DEVICE_ABSENT(r) || r == -EINVAL) { log_debug_errno(r, "LUKS device %s is already detached.", setup->dm_node); we_detached = false; } else if (r < 0) |