aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorNicholas Bellinger <nab@linux-iscsi.org>2012-07-11 17:22:16 -0400
committerJames Bottomley <JBottomley@Parallels.com>2012-07-20 03:59:03 -0400
commit59057fbc37178f10a196ab7ec170b80273f75a47 (patch)
tree79b85034672f27cf605d90736c8f1a75ac2c0656 /drivers/scsi
parent0b1017aab197271a78169fde3d7e487bb721997c (diff)
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
This patch changes virtio-scsi to use a new virtio_driver->scan() callback so that scsi_scan_host() can be properly invoked once virtio_dev_probe() has set add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK) to signal active virtio-ring operation, instead of from within virtscsi_probe(). This fixes a bug where SCSI LUN scanning for both virtio-scsi-raw and virtio-scsi/tcm_vhost setups was happening before VIRTIO_CONFIG_S_DRIVER_OK had been set, causing VIRTIO_SCSI_S_BAD_TARGET to occur. This fixes a bug with virtio-scsi/tcm_vhost where LUN scan was not detecting LUNs. Tested with virtio-scsi-raw + virtio-scsi/tcm_vhost w/ IBLOCK on 3.5-rc2 code. Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> Acked-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/virtio_scsi.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index ae3bef7c523f..c7030fbee79c 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -571,6 +571,13 @@ static struct virtio_scsi_target_state *virtscsi_alloc_tgt(
571 return tgt; 571 return tgt;
572} 572}
573 573
574static void virtscsi_scan(struct virtio_device *vdev)
575{
576 struct Scsi_Host *shost = (struct Scsi_Host *)vdev->priv;
577
578 scsi_scan_host(shost);
579}
580
574static void virtscsi_remove_vqs(struct virtio_device *vdev) 581static void virtscsi_remove_vqs(struct virtio_device *vdev)
575{ 582{
576 struct Scsi_Host *sh = virtio_scsi_host(vdev); 583 struct Scsi_Host *sh = virtio_scsi_host(vdev);
@@ -677,9 +684,10 @@ static int __devinit virtscsi_probe(struct virtio_device *vdev)
677 err = scsi_add_host(shost, &vdev->dev); 684 err = scsi_add_host(shost, &vdev->dev);
678 if (err) 685 if (err)
679 goto scsi_add_host_failed; 686 goto scsi_add_host_failed;
680 687 /*
681 scsi_scan_host(shost); 688 * scsi_scan_host() happens in virtscsi_scan() via virtio_driver->scan()
682 689 * after VIRTIO_CONFIG_S_DRIVER_OK has been set..
690 */
683 return 0; 691 return 0;
684 692
685scsi_add_host_failed: 693scsi_add_host_failed:
@@ -735,6 +743,7 @@ static struct virtio_driver virtio_scsi_driver = {
735 .driver.owner = THIS_MODULE, 743 .driver.owner = THIS_MODULE,
736 .id_table = id_table, 744 .id_table = id_table,
737 .probe = virtscsi_probe, 745 .probe = virtscsi_probe,
746 .scan = virtscsi_scan,
738#ifdef CONFIG_PM 747#ifdef CONFIG_PM
739 .freeze = virtscsi_freeze, 748 .freeze = virtscsi_freeze,
740 .restore = virtscsi_restore, 749 .restore = virtscsi_restore,