tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 d5eeab8d eb24fdd8

+7 -6
+5
drivers/scsi/ibmvscsi/ibmvfc.c
··· 3640 3640 struct ibmvfc_host *vhost = tgt->vhost; 3641 3641 struct ibmvfc_event *evt; 3642 3642 3643 + if (!vhost->logged_in) { 3644 + ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT); 3645 + return; 3646 + } 3647 + 3643 3648 if (vhost->discovery_threads >= disc_threads) 3644 3649 return; 3645 3650
-4
drivers/scsi/ibmvscsi/ibmvscsi.c
··· 2320 2320 static int ibmvscsi_remove(struct vio_dev *vdev) 2321 2321 { 2322 2322 struct ibmvscsi_host_data *hostdata = dev_get_drvdata(&vdev->dev); 2323 - unsigned long flags; 2324 2323 2325 2324 srp_remove_host(hostdata->host); 2326 2325 scsi_remove_host(hostdata->host); 2327 2326 2328 2327 purge_requests(hostdata, DID_ERROR); 2329 - 2330 - spin_lock_irqsave(hostdata->host->host_lock, flags); 2331 2328 release_event_pool(&hostdata->pool, hostdata); 2332 - spin_unlock_irqrestore(hostdata->host->host_lock, flags); 2333 2329 2334 2330 ibmvscsi_release_crq_queue(&hostdata->queue, hostdata, 2335 2331 max_events);
+1 -1
drivers/scsi/qla2xxx/qla_attr.c
··· 3031 3031 test_bit(FCPORT_UPDATE_NEEDED, &vha->dpc_flags)) 3032 3032 msleep(1000); 3033 3033 3034 - qla_nvme_delete(vha); 3035 3034 3036 3035 qla24xx_disable_vp(vha); 3037 3036 qla2x00_wait_for_sess_deletion(vha); 3038 3037 3038 + qla_nvme_delete(vha); 3039 3039 vha->flags.delete_progress = 1; 3040 3040 3041 3041 qlt_remove_target(ha, vha);
+1 -1
drivers/scsi/qla2xxx/qla_mbx.c
··· 3153 3153 ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x108c, 3154 3154 "Entered %s.\n", __func__); 3155 3155 3156 - if (vha->flags.qpairs_available && sp->qpair) 3156 + if (sp->qpair) 3157 3157 req = sp->qpair->req; 3158 3158 else 3159 3159 return QLA_FUNCTION_FAILED;