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

Commit a50a5e37 authored by Mike Anderson's avatar Mike Anderson Committed by James Bottomley
Browse files

[SCSI] scsi: move target_destroy call 



This patch moves the calling of target_destroy next to the list_del. This
closed a race being seen while doing a device add on the aic7xxx.

Signed-off-by: default avatarMike Anderson <andmike@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 9dec70e0

drivers/scsi/scsi_scan.c

+2 −3
Original line number Diff line number Diff line
@@ -288,10 +288,7 @@ static void scsi_target_dev_release(struct device *dev) 
{

	struct device *parent = dev->parent;

	struct scsi_target *starget = to_scsi_target(dev);

	struct Scsi_Host *shost = dev_to_shost(parent);



	if (shost->hostt->target_destroy)

		shost->hostt->target_destroy(starget);

	kfree(starget);

	put_device(parent);

}
@@ -416,6 +413,8 @@ static void scsi_target_reap_usercontext(void *data) 
	device_del(&starget->dev);

	transport_destroy_device(&starget->dev);

	spin_lock_irqsave(shost->host_lock, flags);

	if (shost->hostt->target_destroy)

		shost->hostt->target_destroy(starget);

	list_del_init(&starget->siblings);

	spin_unlock_irqrestore(shost->host_lock, flags);

	put_device(&starget->dev);