60 lines
2.5 KiB
Diff
60 lines
2.5 KiB
Diff
From 969b05b3f1dc644e821756205450b06a30c79d7f Mon Sep 17 00:00:00 2001
|
|
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
Date: Sun, 12 Sep 2021 16:14:27 +0900
|
|
Subject: [PATCH] udev-node: do not ignore unexpected errors on removing
|
|
symlink in stack directory
|
|
|
|
Only acceptable error here is -ENOENT.
|
|
|
|
(cherry picked from commit 0706cdf4ec92d6bd40391da0e81a30d9bf851663)
|
|
|
|
Related: #2005024
|
|
---
|
|
src/udev/udev-node.c | 23 ++++++++++++++---------
|
|
1 file changed, 14 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c
|
|
index 61cb9a449b..e1fb387cb9 100644
|
|
--- a/src/udev/udev-node.c
|
|
+++ b/src/udev/udev-node.c
|
|
@@ -334,25 +334,30 @@ static int update_stack_directory(sd_device *dev, const char *dirname, bool add)
|
|
return log_oom_debug();
|
|
|
|
if (!add) {
|
|
- bool unlink_failed = false;
|
|
+ int unlink_error = 0, stat_error = 0;
|
|
|
|
if (stat(dirname, &st) < 0) {
|
|
if (errno == ENOENT)
|
|
return 0; /* The stack directory is already removed. That's OK. */
|
|
- log_device_debug_errno(dev, errno, "Failed to stat %s, ignoring: %m", dirname);
|
|
+ stat_error = -errno;
|
|
}
|
|
|
|
- if (unlink(filename) < 0) {
|
|
- unlink_failed = true;
|
|
- if (errno != ENOENT)
|
|
- log_device_debug_errno(dev, errno, "Failed to remove %s, ignoring: %m", filename);
|
|
- }
|
|
+ if (unlink(filename) < 0)
|
|
+ unlink_error = -errno;
|
|
|
|
if (rmdir(dirname) >= 0 || errno == ENOENT)
|
|
return 0;
|
|
|
|
- if (unlink_failed)
|
|
- return 0; /* If we failed to remove the symlink, there is almost nothing we can do. */
|
|
+ if (unlink_error < 0) {
|
|
+ if (unlink_error == -ENOENT)
|
|
+ return 0;
|
|
+
|
|
+ /* If we failed to remove the symlink, then there is almost nothing we can do. */
|
|
+ return log_device_debug_errno(dev, unlink_error, "Failed to remove %s: %m", filename);
|
|
+ }
|
|
+
|
|
+ if (stat_error < 0)
|
|
+ return log_device_debug_errno(dev, stat_error, "Failed to stat %s: %m", dirname);
|
|
|
|
/* The symlink was removed. Check if the timestamp of directory is changed. */
|
|
r = update_timestamp(dev, dirname, &st);
|