|
@@ -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 == last_target)
|
|
|
|
|
|
+ starget->state == STARGET_REMOVE)
|
|
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);
|