aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/libata-eh.c28
-rw-r--r--drivers/scsi/libata-scsi.c24
-rw-r--r--drivers/scsi/libata.h1
3 files changed, 53 insertions, 0 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index 8ecb8424d7ba..a049bffdf770 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
@@ -667,6 +667,34 @@ void ata_eh_qc_retry(struct ata_queued_cmd *qc)
667} 667}
668 668
669/** 669/**
670 * ata_eh_detach_dev - detach ATA device
671 * @dev: ATA device to detach
672 *
673 * Detach @dev.
674 *
675 * LOCKING:
676 * None.
677 */
678static void ata_eh_detach_dev(struct ata_device *dev)
679{
680 struct ata_port *ap = dev->ap;
681 unsigned long flags;
682
683 ata_dev_disable(dev);
684
685 spin_lock_irqsave(&ap->host_set->lock, flags);
686
687 dev->flags &= ~ATA_DFLAG_DETACH;
688
689 if (ata_scsi_offline_dev(dev)) {
690 dev->flags |= ATA_DFLAG_DETACHED;
691 ap->flags |= ATA_FLAG_SCSI_HOTPLUG;
692 }
693
694 spin_unlock_irqrestore(&ap->host_set->lock, flags);
695}
696
697/**
670 * ata_eh_about_to_do - about to perform eh_action 698 * ata_eh_about_to_do - about to perform eh_action
671 * @ap: target ATA port 699 * @ap: target ATA port
672 * @action: action about to be performed 700 * @action: action about to be performed
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index da9689b70826..3dc6188af0e8 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -2762,3 +2762,27 @@ void ata_scsi_scan_host(struct ata_port *ap)
2762 } 2762 }
2763 } 2763 }
2764} 2764}
2765
2766/**
2767 * ata_scsi_offline_dev - offline attached SCSI device
2768 * @dev: ATA device to offline attached SCSI device for
2769 *
2770 * This function is called from ata_eh_hotplug() and responsible
2771 * for taking the SCSI device attached to @dev offline. This
2772 * function is called with host_set lock which protects dev->sdev
2773 * against clearing.
2774 *
2775 * LOCKING:
2776 * spin_lock_irqsave(host_set lock)
2777 *
2778 * RETURNS:
2779 * 1 if attached SCSI device exists, 0 otherwise.
2780 */
2781int ata_scsi_offline_dev(struct ata_device *dev)
2782{
2783 if (dev->sdev) {
2784 scsi_device_set_state(dev->sdev, SDEV_OFFLINE);
2785 return 1;
2786 }
2787 return 0;
2788}
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h
index 2d704be355cc..e38759fdc183 100644
--- a/drivers/scsi/libata.h
+++ b/drivers/scsi/libata.h
@@ -75,6 +75,7 @@ extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg);
75extern struct scsi_transport_template ata_scsi_transport_template; 75extern struct scsi_transport_template ata_scsi_transport_template;
76 76
77extern void ata_scsi_scan_host(struct ata_port *ap); 77extern void ata_scsi_scan_host(struct ata_port *ap);
78extern int ata_scsi_offline_dev(struct ata_device *dev);
78extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf, 79extern unsigned int ata_scsiop_inq_std(struct ata_scsi_args *args, u8 *rbuf,
79 unsigned int buflen); 80 unsigned int buflen);
80 81