leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SCSI] raid class: handle component-add errors

Browse Source 
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Jeff Garzik 2006-10-04 07:05:11 -04:00 committed by James Bottomley
parent 83aabc1be5
commit ed542bed12
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/scsi/raid_class.c
View File

@ -215,18 +215,19 @@ static void raid_component_release(struct class_device *cdev)
kfree(rc); kfree(rc);
} }
void raid_component_add(struct raid_template *r,struct device *raid_dev, int raid_component_add(struct raid_template *r,struct device *raid_dev,
struct device *component_dev) struct device *component_dev)
{ {
struct class_device *cdev = struct class_device *cdev =
attribute_container_find_class_device(&r->raid_attrs.ac, attribute_container_find_class_device(&r->raid_attrs.ac,
raid_dev); raid_dev);
struct raid_component *rc; struct raid_component *rc;
struct raid_data *rd = class_get_devdata(cdev); struct raid_data *rd = class_get_devdata(cdev);
int err;
rc = kzalloc(sizeof(*rc), GFP_KERNEL); rc = kzalloc(sizeof(*rc), GFP_KERNEL);
if (!rc) if (!rc)
return; return -ENOMEM;
INIT_LIST_HEAD(&rc->node); INIT_LIST_HEAD(&rc->node);
class_device_initialize(&rc->cdev); class_device_initialize(&rc->cdev);
@ -239,7 +240,18 @@ void raid_component_add(struct raid_template *r,struct device *raid_dev,
list_add_tail(&rc->node, &rd->component_list); list_add_tail(&rc->node, &rd->component_list);
rc->cdev.parent = cdev; rc->cdev.parent = cdev;
rc->cdev.class = &raid_class.class; 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); EXPORT_SYMBOL(raid_component_add);

5
include/linux/raid_class.h
View File

@ -77,5 +77,6 @@ DEFINE_RAID_ATTRIBUTE(enum raid_state, state)
struct raid_template *raid_class_attach(struct raid_function_template *); struct raid_template *raid_class_attach(struct raid_function_template *);
void raid_class_release(struct raid_template *); void raid_class_release(struct raid_template *);
void raid_component_add(struct raid_template *, struct device *, int __must_check raid_component_add(struct raid_template *, struct device *,
struct device *); struct device *);