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

Commit 305c2e71 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files

Revert "scsi: fix soft lockup in scsi_remove_target() on module removal" 



Now that we've done a more comprehensive fix with the intermediate
target state we can remove the previous hack introduced with commit
90a88d6e ("scsi: fix soft lockup in scsi_remove_target() on module
removal").

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarEwan D. Milne <emilne@redhat.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f05795d3

drivers/scsi/scsi_sysfs.c

+2 −4
Original line number Diff line number Diff line
@@ -1367,19 +1367,17 @@ static void __scsi_remove_target(struct scsi_target *starget) 
void scsi_remove_target(struct device *dev)

{

	struct Scsi_Host *shost = dev_to_shost(dev->parent);

	struct scsi_target *starget, *last_target = NULL;

	struct scsi_target *starget;

	unsigned long flags;



restart:

	spin_lock_irqsave(shost->host_lock, flags);

	list_for_each_entry(starget, &shost->__targets, siblings) {

		if (starget->state == STARGET_DEL ||

		    starget->state == STARGET_REMOVE ||

		    starget == last_target)

		    starget->state == STARGET_REMOVE)

			continue;

		if (starget->dev.parent == dev || &starget->dev == dev) {

			kref_get(&starget->reap_ref);

			last_target = starget;

			starget->state = STARGET_REMOVE;

			spin_unlock_irqrestore(shost->host_lock, flags);

			__scsi_remove_target(starget);