From 80e13403f7135e85d5f38e041a51b03891c656f7 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Wed, 4 Dec 2013 14:49:40 +0800 Subject: discover/udev: Use UUIDs for multipath check Partitions will share a serial number. Signed-off-by: Jeremy Kerr --- discover/udev.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'discover/udev.c') diff --git a/discover/udev.c b/discover/udev.c index 80029d6..305df95 100644 --- a/discover/udev.c +++ b/discover/udev.c @@ -62,7 +62,7 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) { struct discover_device *ddev; const char *typestr; - const char *serial; + const char *uuid; const char *path; const char *name; const char *node; @@ -112,19 +112,24 @@ static int udev_handle_dev_add(struct pb_udev *udev, struct udev_device *dev) return -1; } - /* we may also see multipath devices; same dev nodes (hence id), but - * different serial numbers */ - serial = udev_device_get_property_value(dev, "ID_SERIAL"); - if (serial && device_lookup_by_serial(udev->handler, serial)) - return -1; + /* We may see multipath devices; they'll have the same uuid as an + * existing device, so only parse the first. */ + uuid = udev_device_get_property_value(dev, "ID_FS_UUID"); + if (uuid) { + ddev = device_lookup_by_uuid(udev->handler, uuid); + if (ddev) { + pb_log("SKIP: %s UUID [%s] already present (as %s)\n", + name, uuid, ddev->device->id); + return -1; + } + } ddev = discover_device_create(udev->handler, name); ddev->device_path = talloc_strdup(ddev, node); - prop = udev_device_get_property_value(dev, "ID_FS_UUID"); - if (prop) - ddev->uuid = talloc_strdup(ddev, prop); + if (uuid) + ddev->uuid = talloc_strdup(ddev, uuid); prop = udev_device_get_property_value(dev, "ID_FS_LABEL"); if (prop) ddev->label = talloc_strdup(ddev, prop); -- cgit v1.2.1