33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
|
From a075830244f699703a88a492413d931eaeb23a65 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||
|
|
Date: Thu, 2 Sep 2021 08:23:35 +0900
|
||
|
|
Subject: [PATCH] udev-node: shorten code a bit and update log message
|
||
|
|
|
||
|
|
(cherry picked from commit 8424da2de88ceeed7be8544fb69221f0b0ea84ea)
|
||
|
|
|
||
|
|
Related: #1977994
|
||
|
|
---
|
||
|
|
src/udev/udev-node.c | 5 ++---
|
||
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
|
||
|
|
index 28e6e8df94..2e7df899e4 100644
|
||
|
|
--- a/src/udev/udev-node.c
|
||
|
|
+++ b/src/udev/udev-node.c
|
||
|
|
@@ -447,13 +447,12 @@ static int link_update(sd_device *dev, const char *slink_in, bool add) {
|
||
|
|
_cleanup_free_ char *target = NULL;
|
||
|
|
struct stat st1 = {}, st2 = {};
|
||
|
|
|
||
|
|
- r = stat(dirname, &st1);
|
||
|
|
- if (r < 0 && errno != ENOENT)
|
||
|
|
+ if (stat(dirname, &st1) < 0 && errno != ENOENT)
|
||
|
|
return log_device_debug_errno(dev, errno, "Failed to stat %s: %m", dirname);
|
||
|
|
|
||
|
|
r = link_find_prioritized(dev, add, dirname, &target);
|
||
|
|
if (r < 0)
|
||
|
|
- return log_device_debug_errno(dev, r, "Failed to determine highest priority for symlink '%s': %m", slink);
|
||
|
|
+ return log_device_debug_errno(dev, r, "Failed to determine device node with the highest priority for '%s': %m", slink);
|
||
|
|
if (r == 0) {
|
||
|
|
log_device_debug(dev, "No reference left for '%s', removing", slink);
|
||
|
|
|