Commit b232973f authored by James Bottomley's avatar James Bottomley Committed by Greg Kroah-Hartman

SCSI: enclosure: fix WARN_ON in dual path device removing

commit a1470c7b upstream.

Bug report from: wenxiong@linux.vnet.ibm.com

The issue is happened in dual controller configuration. We got the
sysfs warnings when rmmod the ipr module.

enclosure_unregister() in drivers/msic/enclosure.c, call device_unregister()
for each componment deivce, device_unregister() ->device_del()->kobject_del()
->sysfs_remove_dir(). In sysfs_remove_dir(), set kobj->sd = NULL.

For each componment device,
enclosure_component_release()->enclosure_remove_links()->sysfs_remove_link()
in which checking kobj->sd again, it has been set as NULL when doing
device_unregister. So we saw all these sysfs WARNING.

Tested-by: wenxiong@linux.vnet.ibm.com
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e73078f
...@@ -198,6 +198,13 @@ static void enclosure_remove_links(struct enclosure_component *cdev) ...@@ -198,6 +198,13 @@ static void enclosure_remove_links(struct enclosure_component *cdev)
{ {
char name[ENCLOSURE_NAME_SIZE]; char name[ENCLOSURE_NAME_SIZE];
/*
* 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;
enclosure_link_name(cdev, name); enclosure_link_name(cdev, name);
sysfs_remove_link(&cdev->dev->kobj, name); sysfs_remove_link(&cdev->dev->kobj, name);
sysfs_remove_link(&cdev->cdev.kobj, "device"); sysfs_remove_link(&cdev->cdev.kobj, "device");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment