udev man page: add operators

[elogind.git] / udev_remove.c

diff --git a/udev_remove.c b/udev_remove.c
index c3a7880b496cb2a9d25554a5e5a59b92daef83c5..cf28ff37a9bfb56044e9feb625af239ef2f74582 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -34,7 +34,6 @@
 #include "udev.h"
 #include "udev_utils.h"
 #include "udev_version.h"
-#include "namedev.h"
 #include "udev_db.h"
 #include "logging.h"
 
@@ -141,26 +140,20 @@ static int delete_node(struct udevice *udev)
  */
 int udev_remove_device(struct udevice *udev)
 {
-       const char *temp;
-
-       if (udev->type != BLOCK && udev->type != CLASS)
+       if (udev->type != DEV_BLOCK && udev->type != DEV_CLASS)
                return 0;
 
-       if (udev_db_get_device(udev, udev->devpath) == 0) {
-               if (udev->ignore_remove) {
-                       dbg("remove event for '%s' requested to be ignored by rule", udev->name);
-                       return 0;
-               }
-               dbg("remove name='%s'", udev->name);
-               udev_db_delete_device(udev);
-       } else {
-               /* fall back to kernel name */
-               temp = strrchr(udev->devpath, '/');
-               if (temp == NULL)
-                       return -ENODEV;
-               strlcpy(udev->name, &temp[1], sizeof(udev->name));
-               dbg("'%s' not found in database, falling back on default name", udev->name);
+       /* remove node only if we can find it in our database */
+       if (udev_db_get_device(udev, udev->devpath) != 0) {
+               dbg("'%s' not found in database, ignore event", udev->name);
+               return -1;
+       }
+       if (udev->ignore_remove) {
+               dbg("remove event for '%s' requested to be ignored by rule", udev->name);
+               return 0;
        }
+       dbg("remove name='%s'", udev->name);
+       udev_db_delete_device(udev);
 
        /* use full path to the environment */
        snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);