unify/cleanup event handling

[elogind.git] / udev / udev-node.c

diff --git a/udev/udev-node.c b/udev/udev-node.c
index 3aee15b5844e0b926e132f701f9dee95ea7fbe9d..3b4eb5f00bfb5ab18c53ca84ee059f3bd54be8f0 100644 (file)
--- a/udev/udev-node.c
+++ b/udev/udev-node.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2009 Kay Sievers <kay.sievers@vrfy.org>
+ * Copyright (C) 2003-2010 Kay Sievers <kay.sievers@vrfy.org>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -416,7 +416,6 @@ int udev_node_remove(struct udev_device *dev)
        const char *devnode;
        char partitionname[UTIL_PATH_SIZE];
        struct stat stats;
-       struct udev_device *dev_check;
        int err = 0;
        int num;
 
@@ -436,15 +435,21 @@ int udev_node_remove(struct udev_device *dev)
                return -1;
        }
 
-       dev_check = udev_device_new_from_syspath(udev, udev_device_get_syspath(dev));
-       if (dev_check != NULL && stats.st_rdev == udev_device_get_devnum(dev_check)) {
-               /* do not remove device node if the same sys-device is re-created in the meantime */
-               info(udev, "keeping device node of existing device'%s'\n", devnode);
+       if (udev_device_get_ignore_remove(dev)) {
+               info(udev, "ignore_remove for '%s'\n", udev_device_get_devnode(dev));
        } else {
-               info(udev, "removing device node '%s'\n", devnode);
-               err = util_unlink_secure(udev, devnode);
+               struct udev_device *dev_check;
+
+               dev_check = udev_device_new_from_syspath(udev, udev_device_get_syspath(dev));
+               if (dev_check != NULL && stats.st_rdev == udev_device_get_devnum(dev_check)) {
+                       /* do not remove device node if the same sys-device is re-created in the meantime */
+                       info(udev, "keeping device node of existing device'%s'\n", devnode);
+               } else {
+                       info(udev, "removing device node '%s'\n", devnode);
+                       err = util_unlink_secure(udev, devnode);
+               }
+               udev_device_unref(dev_check);
        }
-       udev_device_unref(dev_check);
 
        num = udev_device_get_num_fake_partitions(dev);
        if (num > 0) {
@@ -459,6 +464,7 @@ int udev_node_remove(struct udev_device *dev)
                        util_unlink_secure(udev, partitionname);
                }
        }
+
        util_delete_path(udev, devnode);
        return err;
 }