提交 305c2e71 编写于 作者: J Johannes Thumshirn 提交者: Martin K. Petersen

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: NJohannes Thumshirn <jthumshirn@suse.de>
Cc: stable@vger.kernel.org
Reviewed-by: NEwan D. Milne <emilne@redhat.com>
Reviewed-by: NHannes Reinecke <hare@suse.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
上级 f05795d3
...@@ -1367,19 +1367,17 @@ static void __scsi_remove_target(struct scsi_target *starget) ...@@ -1367,19 +1367,17 @@ static void __scsi_remove_target(struct scsi_target *starget)
void scsi_remove_target(struct device *dev) void scsi_remove_target(struct device *dev)
{ {
struct Scsi_Host *shost = dev_to_shost(dev->parent); struct Scsi_Host *shost = dev_to_shost(dev->parent);
struct scsi_target *starget, *last_target = NULL; struct scsi_target *starget;
unsigned long flags; unsigned long flags;
restart: restart:
spin_lock_irqsave(shost->host_lock, flags); spin_lock_irqsave(shost->host_lock, flags);
list_for_each_entry(starget, &shost->__targets, siblings) { list_for_each_entry(starget, &shost->__targets, siblings) {
if (starget->state == STARGET_DEL || if (starget->state == STARGET_DEL ||
starget->state == STARGET_REMOVE || starget->state == STARGET_REMOVE)
starget == last_target)
continue; continue;
if (starget->dev.parent == dev || &starget->dev == dev) { if (starget->dev.parent == dev || &starget->dev == dev) {
kref_get(&starget->reap_ref); kref_get(&starget->reap_ref);
last_target = starget;
starget->state = STARGET_REMOVE; starget->state = STARGET_REMOVE;
spin_unlock_irqrestore(shost->host_lock, flags); spin_unlock_irqrestore(shost->host_lock, flags);
__scsi_remove_target(starget); __scsi_remove_target(starget);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册