On Wed, 2015-03-18 at 17:18 -0500, wenxiong@xxxxxxxxxxxxxxxxxx wrote:
> From: Wen Xiong <wenxiong@xxxxxxxxxxxxxxxxxx>
>
> Hi James,
>
> Our test teams still see lots of these errors in error log when dlpar removing
> the adapter in dual configuration. So I re-submit the patch.
OK so in this case you have two struct devices for one bay (one for each
path). The links are screwed up because a bay only points at one device
(although each device points to an enclosure).
We have a check, so the enclosure backlink points to the first device it
encountered.
The scope for cockups in this situation is huge (like if the device the
enclosure points to gets removed
> diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
> index 38552a3..0d20e19 100644
> --- a/drivers/misc/enclosure.c
> +++ b/drivers/misc/enclosure.c
> @@ -209,6 +209,9 @@ static void enclosure_remove_links(struct enclosure_component *cdev)
> if (!cdev->dev->kobj.sd)
> return;
>
> + if (!cdev->cdev.kobj.sd)
> + return;
> +
> enclosure_link_name(cdev, name);
> sysfs_remove_link(&cdev->dev->kobj, name);
> sysfs_remove_link(&cdev->cdev.kobj, "device");
This doesn't look right: for this to work it means you have to have a
dev with a kernfs link but a cdev without one. We probably still need
to remove the dangling dev link.
Does this work? It should remove either link if they exist.
James
---
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 38552a3..65fed71 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -202,16 +202,17 @@ static void enclosure_remove_links(struct enclosure_component *cdev)
{
char name[ENCLOSURE_NAME_SIZE];
+ enclosure_link_name(cdev, name);
+
/*
* In odd circumstances, like multipath devices, something else may
* already have removed the links, so check for this condition first.
*/
- if (!cdev->dev->kobj.sd)
- return;
+ if (cdev->dev->kobj.sd)
+ sysfs_remove_link(&cdev->dev->kobj, name);
- enclosure_link_name(cdev, name);
- sysfs_remove_link(&cdev->dev->kobj, name);
- sysfs_remove_link(&cdev->cdev.kobj, "device");
+ if (cdev->cdev.kobj.sd)
+ sysfs_remove_link(&cdev->cdev.kobj, "device");
}
static int enclosure_add_links(struct enclosure_component *cdev)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
