History

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley: "Four minor fixes, all in drivers (qla2xxx, ibmvfc, ibmvscsi)" * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: scsi: ibmvscsi: Fix WARN_ON during event pool release scsi: ibmvfc: Don't send implicit logouts prior to NPIV login scsi: qla2xxx: Delete all sessions before unregister local nvme port scsi: qla2xxx: Fix hang when issuing nvme disconnect-all in NPIV

Linus Torvalds committed 6 years ago

Commit d5eeab82 parents eb24fdd b3652214 files · +7 −6Browse files

Unified · Split

4 files
  1. drivers/scsi/ibmvscsi/ibmvfc.c +5 −0
  2. drivers/scsi/ibmvscsi/ibmvscsi.c +0 −4
  3. drivers/scsi/qla2xxx/qla_attr.c +1 −1
  4. drivers/scsi/qla2xxx/qla_mbx.c +1 −1
drivers/scsi/ibmvscsi/ibmvfc.c+5−0
@@ -3640,6 +3640,11 @@ static void ibmvfc_tgt_implicit_logout_and_del(struct ibmvfc_target *tgt) · 3639 unmodified lines
36403640 struct ibmvfc_host *vhost = tgt->vhost;
36413641 struct ibmvfc_event *evt;
36423642
3643+ if (!vhost->logged_in) {
3644+ ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT);
3645+ return;
3646+ }
3647+
36433648 if (vhost->discovery_threads >= disc_threads)
36443649 return;
36453650
drivers/scsi/ibmvscsi/ibmvscsi.c+0−4
@@ -2320,16 +2320,12 @@ static int ibmvscsi_probe(struct vio_dev *vdev, const struct vio_device_id *id) · 2319 unmodified lines
23202320 static int ibmvscsi_remove(struct vio_dev *vdev)
23212321 {
23222322 struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&vdev->dev);
2323− unsigned long flags;
23242323
23252324 srp_remove_host(hostdata->host);
23262325 scsi_remove_host(hostdata->host);
23272326
23282327 purge_requests(hostdata, DID_ERROR);
2329−
2330− spin_lock_irqsave(hostdata->host->host_lock, flags);
23312328 release_event_pool(&hostdata->pool, hostdata);
2332− spin_unlock_irqrestore(hostdata->host->host_lock, flags);
23332329
23342330 ibmvscsi_release_crq_queue(&hostdata->queue, hostdata,
23352331 max_events);
drivers/scsi/qla2xxx/qla_attr.c+1−1
@@ -3031,11 +3031,11 @@ qla24xx_vport_delete(struct fc_vport *fc_vport) · 3030 unmodified lines
30313031 test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags))
30323032 msleep(1000);
30333033
3034− qla_nvme_delete(vha);
30353034
30363035 qla24xx_disable_vp(vha);
30373036 qla2x00_wait_for_sess_deletion(vha);
30383037
3038+ qla_nvme_delete(vha);
30393039 vha->flags.delete_progress = 1;
30403040
30413041 qlt_remove_target(ha, vha);
drivers/scsi/qla2xxx/qla_mbx.c+1−1
@@ -3153,7 +3153,7 @@ qla24xx_abort_command(srb_t *sp) · 3152 unmodified lines
31533153 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108c,
31543154 "Entered %s.\n", __func__);
31553155
3156− if (vha->flags.qpairs_available && sp->qpair)
3156+ if (sp->qpair)
31573157 req = sp->qpair->req;
31583158 else
31593159 return QLA_FUNCTION_FAILED;