X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev_remove.c;h=0ba6962cad660f481714d91ebb2c235a79e0b363;hp=172ec12690ac993f339444a1c711e8c8986213f3;hb=5ef42682053f57fc031d420f0a2ae3e204421b8d;hpb=6d56416665863dc2b4fb107dbdc779e4791bdf9e

diff --git a/udev_remove.c b/udev_remove.c
index 172ec1269..0ba6962ca 100644
--- a/udev_remove.c
+++ b/udev_remove.c
@@ -71,6 +71,7 @@ static int delete_node(struct udevice *udev)
 {
 	char filename[NAME_SIZE];
 	char partitionname[NAME_SIZE];
+	struct stat stats;
 	int retval;
 	int i;
 	char *pos;
@@ -80,6 +81,15 @@ static int delete_node(struct udevice *udev)
 	snprintf(filename, NAME_SIZE, "%s/%s", udev_root, udev->name);
 	filename[NAME_SIZE-1] = '\0';
 
+	dbg("checking major/minor of device node '%s'", filename);
+	if (stat(filename, &stats) != 0)
+		return -1;
+
+	if (udev->devt && stats.st_rdev != udev->devt) {
+		info("device node '%s' points to a different device, skip removal", filename);
+		return -1;
+	}
+
 	info("removing device node '%s'", filename);
 	retval = unlink_secure(filename);
 	if (retval)
@@ -137,7 +147,7 @@ int udev_remove_device(struct udevice *udev)
 	const char *temp;
 	int retval;
 
-	if (udev->type != 'b' && udev->type != 'c')
+	if (udev->type != BLOCK && udev->type != CLASS)
 		return 0;
 
 	retval = udev_db_get_device(udev);