Patch "Revert "scsi: fix soft lockup in scsi_remove_target() on module removal"" has been added to the 4.6-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
revert-scsi-fix-soft-lockup-in-scsi_remove_target-on-module-removal.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Johannes Thumshirn <[email protected]>
Date: Tue, 5 Apr 2016 11:50:45 +0200
Subject: Revert "scsi: fix soft lockup in scsi_remove_target() on module removal"

From: Johannes Thumshirn <[email protected]>

commit 305c2e71b3d733ec065cb716c76af7d554bd5571 upstream.

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

---
 drivers/scsi/scsi_sysfs.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

@@ -1366,19 +1366,17 @@ static void __scsi_remove_target(struct
 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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/mcb-fixed-bar-number-assignment-for-the-gdd.patch queue-4.6/revert-scsi-fix-soft-lockup-in-scsi_remove_target-on-module-removal.patch queue-4.6/scsi-add-intermediate-starget_remove-state-to-scsi_target_state.patch