Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11c86708 authored by Zhu Wang's avatar Zhu Wang Committed by Greg Kroah-Hartman
Browse files

scsi: core: raid_class: Remove raid_component_add() 



commit 60c5fd2e8f3c42a5abc565ba9876ead1da5ad2b7 upstream.

The raid_component_add() function was added to the kernel tree via patch
"[SCSI] embryonic RAID class" (2005). Remove this function since it never
has had any callers in the Linux kernel. And also raid_component_release()
is only used in raid_component_add(), so it is also removed.

Signed-off-by: default avatarZhu Wang <wangzhu9@huawei.com>
Link: https://lore.kernel.org/r/20230822015254.184270-1-wangzhu9@huawei.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Fixes: 04b5b5cb0136 ("scsi: core: Fix possible memory leak if device_add() fails")
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 24766175

drivers/scsi/raid_class.c

+0 −48
Original line number Diff line number Diff line
@@ -210,54 +210,6 @@ raid_attr_ro_state(level); 
raid_attr_ro_fn(resync);

raid_attr_ro_state_fn(state);



static void raid_component_release(struct device *dev)

{

	struct raid_component *rc =

		container_of(dev, struct raid_component, dev);

	dev_printk(KERN_ERR, rc->dev.parent, "COMPONENT RELEASE\n");

	put_device(rc->dev.parent);

	kfree(rc);

}



int raid_component_add(struct raid_template *r,struct device *raid_dev,

		       struct device *component_dev)

{

	struct device *cdev =

		attribute_container_find_class_device(&r->raid_attrs.ac,

						      raid_dev);

	struct raid_component *rc;

	struct raid_data *rd = dev_get_drvdata(cdev);

	int err;



	rc = kzalloc(sizeof(*rc), GFP_KERNEL);

	if (!rc)

		return -ENOMEM;



	INIT_LIST_HEAD(&rc->node);

	device_initialize(&rc->dev);

	rc->dev.release = raid_component_release;

	rc->dev.parent = get_device(component_dev);

	rc->num = rd->component_count++;



	dev_set_name(&rc->dev, "component-%d", rc->num);

	list_add_tail(&rc->node, &rd->component_list);

	rc->dev.class = &raid_class.class;

	err = device_add(&rc->dev);

	if (err)

		goto err_out;



	return 0;



err_out:

	put_device(&rc->dev);

	list_del(&rc->node);

	rd->component_count--;

	put_device(component_dev);

	kfree(rc);

	return err;

}

EXPORT_SYMBOL(raid_component_add);



struct raid_template *

raid_class_attach(struct raid_function_template *ft)

{

include/linux/raid_class.h

+0 −4
Original line number Diff line number Diff line
@@ -78,7 +78,3 @@ DEFINE_RAID_ATTRIBUTE(enum raid_state, state) 
	

struct raid_template *raid_class_attach(struct raid_function_template *);

void raid_class_release(struct raid_template *);
 


int __must_check raid_component_add(struct raid_template *, struct device *,

				    struct device *);