[PATCH] This patch causes the remove handler to check that each symlink

diff --git a/udev_remove.c b/udev_remove.c
index 1fd36d24c5f93e5037be42311134c6ba9a1082f7..c3a7880b496cb2a9d25554a5e5a59b92daef83c5 100644 (file)
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -78,13 +78,33 @@ static int delete_node(struct udevice *udev)
        int i;
        int num;
 
        int i;
        int num;
 

+       list_for_each_entry(name_loop, &udev->symlink_list, node) {
+               snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
+               filename[sizeof(filename)-1] = '\0';
+
+               if (stat(filename, &stats) != 0) {
+                       dbg("symlink '%s' not found", filename);
+                       continue;
+               }
+               if (udev->devt && stats.st_rdev != udev->devt) {
+                       info("symlink '%s' points to a different device, skip removal", filename);
+                       continue;;
+               }
+
+               dbg("removing symlink '%s'", filename);
+               unlink(filename);
+
+               if (strchr(filename, '/'))
+                       delete_path(filename);
+       }
+

        snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
        filename[sizeof(filename)-1] = '\0';
 
        snprintf(filename, sizeof(filename), "%s/%s", udev_root, udev->name);
        filename[sizeof(filename)-1] = '\0';
 

-       dbg("checking major/minor of device node '%s'", filename);
-       if (stat(filename, &stats) != 0)
+       if (stat(filename, &stats) != 0) {
+               dbg("device node '%s' not found", filename);

                return -1;
                return -1;

-
+       }

        if (udev->devt && stats.st_rdev != udev->devt) {
                info("device node '%s' points to a different device, skip removal", filename);
                return -1;
        if (udev->devt && stats.st_rdev != udev->devt) {
                info("device node '%s' points to a different device, skip removal", filename);
                return -1;


@@ -95,7 +115,6 @@ static int delete_node(struct udevice *udev)
        if (retval)
                return retval;
 
        if (retval)
                return retval;
 

-       /* remove all_partitions nodes */

        num = udev->partitions;
        if (num > 0) {
                info("removing all_partitions '%s[1-%i]'", filename, num);
        num = udev->partitions;
        if (num > 0) {
                info("removing all_partitions '%s[1-%i]'", filename, num);


@@ -110,28 +129,9 @@ static int delete_node(struct udevice *udev)
                }
        }
 
                }
        }
 

-       /* remove subdirectories */

        if (strchr(udev->name, '/'))
                delete_path(filename);
 
        if (strchr(udev->name, '/'))
                delete_path(filename);
 

-       list_for_each_entry(name_loop, &udev->symlink_list, node) {
-               snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
-               filename[sizeof(filename)-1] = '\0';
-
-               dbg("unlinking symlink '%s'", filename);
-               retval = unlink(filename);
-               if (errno == ENOENT)
-                       retval = 0;
-               if (retval) {
-                       dbg("unlink(%s) failed with error '%s'",
-                               filename, strerror(errno));
-                       return retval;
-               }
-               if (strchr(filename, '/')) {
-                       delete_path(filename);
-               }
-       }
-

        return retval;
 }
 
        return retval;
 }