shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-02 13:47:27 +03:00
Code

errno-util: add ERRNO_IS_DEVICE_ABSENT() macro

Browse Source 
Inspired by: https://github.com/systemd/systemd/pull/22717#discussion_r834254495
This commit is contained in:
Lennart Poettering 2022-03-24 13:50:50 +01:00
parent 4029328014
commit 3f2ada89f3
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/basic/errno-util.h
View File

@ -138,10 +138,18 @@ static inline bool ERRNO_IS_PRIVILEGE(int r) {
EPERM); EPERM);
} }
/* Three difference errors for "not enough disk space" */ /* Three different errors for "not enough disk space" */
static inline bool ERRNO_IS_DISK_SPACE(int r) { static inline bool ERRNO_IS_DISK_SPACE(int r) {
return IN_SET(abs(r), return IN_SET(abs(r),
ENOSPC, ENOSPC,
EDQUOT, EDQUOT,
EFBIG); EFBIG);
} }
/* Three different errors for "this device does not quite exist" */
static inline bool ERRNO_IS_DEVICE_ABSENT(int r) {
return IN_SET(abs(r),
ENODEV,
ENXIO,
ENOENT);
}

4
src/home/homework-luks.c
View File

@ -495,7 +495,7 @@ static int acquire_open_luks_device(
return r; return r;
r = sym_crypt_init_by_name(&cd, setup->dm_name); 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; return 0;
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to initialize cryptsetup context for %s: %m", setup->dm_name); 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); cryptsetup_enable_logging(setup->crypt_device);
r = sym_crypt_deactivate_by_name(setup->crypt_device, setup->dm_name, 0); 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); log_debug_errno(r, "LUKS device %s is already detached.", setup->dm_node);
we_detached = false; we_detached = false;
} else if (r < 0) } else if (r < 0)

2
src/rfkill/rfkill.c
View File

@ -80,7 +80,7 @@ static int find_device(
r = sd_device_new_from_subsystem_sysname(&device, "rfkill", sysname); r = sd_device_new_from_subsystem_sysname(&device, "rfkill", sysname);
if (r < 0) if (r < 0)
return log_full_errno(IN_SET(r, -ENOENT, -ENXIO, -ENODEV) ? LOG_DEBUG : LOG_ERR, r, return log_full_errno(ERRNO_IS_DEVICE_ABSENT(r) ? LOG_DEBUG : LOG_ERR, r,
"Failed to open device '%s': %m", sysname); "Failed to open device '%s': %m", sysname);
r = sd_device_get_sysattr_value(device, "name", &name); r = sd_device_get_sysattr_value(device, "name", &name);

3
src/udev/udev-builtin-btrfs.c
View File

@ -6,6 +6,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "device-util.h" #include "device-util.h"
#include "errno-util.h"
#include "fd-util.h" #include "fd-util.h"
#include "string-util.h" #include "string-util.h"
#include "strxcpyx.h" #include "strxcpyx.h"
@ -22,7 +23,7 @@ static int builtin_btrfs(sd_device *dev, sd_netlink **rtnl, int argc, char *argv
fd = open("/dev/btrfs-control", O_RDWR|O_CLOEXEC); fd = open("/dev/btrfs-control", O_RDWR|O_CLOEXEC);
if (fd < 0) { if (fd < 0) {
if (IN_SET(errno, ENOENT, ENXIO, ENODEV)) { if (ERRNO_IS_DEVICE_ABSENT(errno)) {
/* Driver not installed? Then we aren't ready. This is useful in initrds that lack /* Driver not installed? Then we aren't ready. This is useful in initrds that lack
* btrfs.ko. After the host transition (where btrfs.ko will hopefully become * btrfs.ko. After the host transition (where btrfs.ko will hopefully become
* available) the device can be retriggered and will then be considered ready. */ * available) the device can be retriggered and will then be considered ready. */