]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
udev: drop unnecessary code
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 5 Apr 2022 16:35:04 +0000 (01:35 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 6 Apr 2022 05:46:13 +0000 (14:46 +0900)
Follow-up for 78e278ad48e0d2854f950f261804fde70121820e.

src/udev/udev-node.c

index c313181041660edd92fed79f95b17a20c23c8130..4afd6048609f87760612df21dd0e50705aa4e43f 100644 (file)
@@ -598,11 +598,10 @@ int udev_node_apply_permissions(
                 gid_t gid,
                 OrderedHashmap *seclabel_list) {
 
-        const char *devnode, *subsystem;
+        const char *devnode;
         bool apply_mode, apply_uid, apply_gid;
         _cleanup_close_ int node_fd = -1;
         struct stat stats;
-        dev_t devnum;
         int r;
 
         assert(dev);
@@ -610,17 +609,6 @@ int udev_node_apply_permissions(
         r = sd_device_get_devname(dev, &devnode);
         if (r < 0)
                 return log_device_debug_errno(dev, r, "Failed to get devname: %m");
-        r = sd_device_get_subsystem(dev, &subsystem);
-        if (r < 0)
-                return log_device_debug_errno(dev, r, "Failed to get subsystem: %m");
-        r = sd_device_get_devnum(dev, &devnum);
-        if (r < 0)
-                return log_device_debug_errno(dev, r, "Failed to get devnum: %m");
-
-        if (streq(subsystem, "block"))
-                mode |= S_IFBLK;
-        else
-                mode |= S_IFCHR;
 
         node_fd = sd_device_open(dev, O_PATH|O_CLOEXEC);
         if (node_fd < 0) {