SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udev-node: drop workaround for by-diskseq symlinks

Browse Source 
This effectively reverts 09373c1a50,
as stack directories and lock files are removed by udev workers on
unlocking.
This commit is contained in:
Yu Watanabe
2024-10-12 05:34:07 +09:00
parent 7727b694db
commit b364af59f0
2 changed files with 4 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/udev/udev-node.c
-83
View File
@@ -448,85 +448,6 @@ static int node_get_current(const char *slink, int dirfd, char **ret_id, int *re
return 0;
}
static int link_update_diskseq(sd_device *dev, const char *slink, bool add) {
_cleanup_free_ char *buf = NULL;
const char *fname, *diskseq;
int r;
assert(dev);
assert(slink);
if (!device_in_subsystem(dev, "block"))
return 0;
fname = path_startswith(slink, "/dev/disk/by-diskseq");
if (isempty(fname))
return 0;
if (device_is_devtype(dev, "partition")) {
_cleanup_free_ char *suffix = NULL;
const char *partn, *p;
/* Check if the symlink has an expected suffix "-part%n". See 60-persistent-storage.rules. */
r = sd_device_get_sysnum(dev, &partn);
if (r < 0) {
/* Cannot verify the symlink is owned by this device. Let's create the stack directory for the symlink. */
log_device_debug_errno(dev, r, "Failed to get sysnum, but symlink '%s' is requested, ignoring: %m", slink);
return 0;
}
suffix = strjoin("-part", partn);
if (!suffix)
return -ENOMEM;
p = endswith(fname, suffix);
if (!p) {
log_device_debug(dev, "Unexpected by-diskseq symlink '%s' is requested, proceeding anyway.", slink);
return 0;
}
buf = strndup(fname, p - fname);
if (!buf)
return -ENOMEM;
fname = buf;
}
/* Check if the diskseq part of the symlink is in digits. */
if (!in_charset(fname, DIGITS)) {
log_device_debug(dev, "Unexpected by-diskseq symlink '%s' is requested, proceeding anyway.", slink);
return 0; /* unexpected by-diskseq symlink */
}
/* On removal, we cannot verify the diskseq. Skipping further check below. */
if (!add) {
r = node_remove_symlink(dev, slink);
if (r < 0)
return r;
return 1; /* done */
}
/* Check if the diskseq matches with the DISKSEQ property. */
r = sd_device_get_property_value(dev, "DISKSEQ", &diskseq);
if (r < 0) {
log_device_debug_errno(dev, r, "Failed to get DISKSEQ property, but symlink '%s' is requested, ignoring: %m", slink);
return 0;
}
if (!streq(fname, diskseq)) {
log_device_debug(dev, "Unexpected by-diskseq symlink '%s' is requested (DISKSEQ=%s), proceeding anyway.", slink, diskseq);
return 0;
}
r = node_create_symlink(dev, /* devnode = */ NULL, slink);
if (r < 0)
return r;
return 1; /* done */
}
static int link_update(sd_device *dev, const char *slink, bool add) {
/* On cleaning up,
* 1. close the stack directory,
@@ -542,10 +463,6 @@ static int link_update(sd_device *dev, const char *slink, bool add) {
assert(dev);
assert(slink);
r = link_update_diskseq(dev, slink, add);
if (r != 0)
return r;
r = stack_directory_open_and_lock(dev, slink, &dirpath, &dirfd, &lockfile);
if (r < 0)
return r;
test/units/TEST-17-UDEV.diskseq.sh
+4 -4
View File
@@ -43,15 +43,15 @@ systemctl daemon-reload
udevadm settle
# If an initrd from the host is used, stack directories for by-diskseq symlinks
# may already exist. Save the number of the directories here.
NUM_DISKSEQ_EXPECTED=$(ls /run/udev/links | grep -c by-diskseq || :)
# Save the current number of the directories.
NUM_DISKSEQ=$(ls /run/udev/links/ | grep -c by-diskseq || :)
systemctl start --no-block test-diskseq.service
for _ in {0..100}; do
sleep .1
assert_eq "$(ls /run/udev/links | grep -c by-diskseq || :)" "$NUM_DISKSEQ_EXPECTED"
n=$(ls /run/udev/links/ | grep -c by-diskseq || :)
(( n <= NUM_DISKSEQ + 1 ))
done
exit 0