[PATCH 4/4 ver 3] SCSI: make starget->reap_ref count the number of underlying devices

[PATCH 4/4 ver 3] SCSI: make starget->reap_ref count the number of underlying devices

[Alan Stern]

This patch (as1248c) changes the meaning of starget->reap_ref.  Now it
serves to count the number of underlying devices beneath the target,
plus one when we want to prevent an empty target from being removed 
from visibility.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

---

Index: usb-2.6/drivers/scsi/scsi_scan.c
===================================================================
--- usb-2.6.orig/drivers/scsi/scsi_scan.c
+++ usb-2.6/drivers/scsi/scsi_scan.c
@@ -303,6 +303,7 @@ static struct scsi_device *scsi_alloc_sd
 	transport_setup_device(&sdev->sdev_gendev);
 
 	spin_lock_irqsave(shost->host_lock, flags);
+	starget->reap_ref++;
 	list_add_tail(&sdev->same_target_siblings, &starget->devices);
 	list_add_tail(&sdev->siblings, &shost->__devices);
 	spin_unlock_irqrestore(shost->host_lock, flags);
@@ -501,8 +502,7 @@ void scsi_target_reap(struct scsi_target
 
 	spin_lock_irqsave(shost->host_lock, flags);
 	state = starget->state;
-	empty = --starget->reap_ref == 0 &&
-		list_empty(&starget->devices) ? 1 : 0;
+	empty = --starget->reap_ref == 0;
 	spin_unlock_irqrestore(shost->host_lock, flags);
 
 	if (!empty)
Index: usb-2.6/drivers/scsi/scsi_sysfs.c
===================================================================
--- usb-2.6.orig/drivers/scsi/scsi_sysfs.c
+++ usb-2.6/drivers/scsi/scsi_sysfs.c
@@ -302,7 +302,6 @@ static void scsi_device_dev_release_user
 	starget = to_scsi_target(parent);
 
 	spin_lock_irqsave(sdev->host->host_lock, flags);
-	starget->reap_ref++;
 	list_del(&sdev->siblings);
 	list_del(&sdev->same_target_siblings);
 	list_del(&sdev->starved_entry);