Merge branch 'drm-next-4.7' of git://people.freedesktop.org/~agd5f/linux into drm...

[cascardo/linux.git] / drivers / scsi / scsi_transport_fc.c

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 8a88226..0f3a386 100644 (file)
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2027,11 +2027,10 @@ static void fc_vport_dev_release(struct device *dev)
        kfree(vport);
 }
 
-int scsi_is_fc_vport(const struct device *dev)
+static int scsi_is_fc_vport(const struct device *dev)
 {
        return dev->release == fc_vport_dev_release;
 }
-EXPORT_SYMBOL(scsi_is_fc_vport);
 
 static int fc_vport_match(struct attribute_container *cont,
                            struct device *dev)
@@ -2110,7 +2109,8 @@ fc_user_scan_tgt(struct Scsi_Host *shost, uint channel, uint id, u64 lun)
                if ((channel == rport->channel) &&
                    (id == rport->scsi_target_id)) {
                        spin_unlock_irqrestore(shost->host_lock, flags);
-                       scsi_scan_target(&rport->dev, channel, id, lun, 1);
+                       scsi_scan_target(&rport->dev, channel, id, lun,
+                                        SCSI_SCAN_MANUAL);
                        return;
                }
        }
@@ -3277,7 +3277,8 @@ fc_scsi_scan_rport(struct work_struct *work)
            (rport->roles & FC_PORT_ROLE_FCP_TARGET) &&
            !(i->f->disable_target_scan)) {
                scsi_scan_target(&rport->dev, rport->channel,
-                       rport->scsi_target_id, SCAN_WILD_CARD, 1);
+                                rport->scsi_target_id, SCAN_WILD_CARD,
+                                SCSI_SCAN_RESCAN);
        }
 
        spin_lock_irqsave(shost->host_lock, flags);