raid class: handle component-add errors
PATCH 1/1 raid class: handle component-add errors
Signed-off-by Jeff Garzik <[email protected]>
---
drivers/scsi/raid_class.c | 20 ++++++++++++++++---- include/linux/raid_class.h | 5 +++-- 2 files changed, 19 insertions(+), 6 deletions(-)
drivers/scsi/raid_class.c +16 -4
@@ -215,18 +215,19 @@ static void raid_component_release(struckfree (rc); } -void raid_component_add (struct raid_template *r,struct device *raid_dev, -struct device *component_dev) +int raid_component_add (struct raid_template *r,struct device *raid_dev, +struct device *component_dev) {struct class_device *cdev =attribute_container_find_class_device (&r->raid_attrs.ac, raid_dev);struct raid_component *rc;struct raid_data *rd =class_get_devdata (cdev); +int err; rc =kzalloc (sizeof (*rc),GFP_KERNEL );if (!rc) -return ; +return -ENOMEM ;INIT_LIST_HEAD (&rc->node);class_device_initialize (&rc->cdev);
@@ -239,7 +240,18 @@ void raid_component_add(struct raid_templist_add_tail (&rc->node, &rd->component_list); rc->cdev.parent = cdev; rc->cdev.class = &raid_class.class; -class_device_add (&rc->cdev); + err =class_device_add (&rc->cdev); +if (err) + goto err_out; + +return 0 ; + +err_out: +list_del (&rc->node); + rd->component_count--; +put_device (component_dev); +kfree (rc); +return err; }EXPORT_SYMBOL (raid_component_add);
include/linux/raid_class.h +3 -2
@@ -77,5 +77,6 @@ DEFINE_RAID_ATTRIBUTE(enum raid_state, sstruct raid_template *raid_class_attach (struct raid_function_template *);void raid_class_release (struct raid_template *); -void raid_component_add (struct raid_template *,struct device *, -struct device *); +int __must_check raid_component_add (struct raid_template *,struct device *, +struct device *); +