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 fixes, all in drivers.

These patches mosly fix error legs and exceptional conditions
(scsi_dh_alua, qla2xxx). The lpfc fixes are for coding issues with
lpfc features"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: lpfc: Correct BDE DMA address assignment for GEN_REQ_WQE
scsi: lpfc: Fix split code for FLOGI on FCoE
scsi: qla2xxx: Fix missed DMA unmap for aborted commands
scsi: scsi_dh_alua: Properly handle the ALUA transitioning state

Linus Torvalds f2dd0074 c3f5e692

+8 -6
+1 -2
drivers/scsi/device_handler/scsi_dh_alua.c
··· 1172 1172 case SCSI_ACCESS_STATE_OPTIMAL: 1173 1173 case SCSI_ACCESS_STATE_ACTIVE: 1174 1174 case SCSI_ACCESS_STATE_LBA: 1175 - return BLK_STS_OK; 1176 1175 case SCSI_ACCESS_STATE_TRANSITIONING: 1177 - return BLK_STS_AGAIN; 1176 + return BLK_STS_OK; 1178 1177 default: 1179 1178 req->rq_flags |= RQF_QUIET; 1180 1179 return BLK_STS_IOERR;
+1 -1
drivers/scsi/lpfc/lpfc_els.c
··· 1330 1330 if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) == 1331 1331 LPFC_SLI_INTF_IF_TYPE_0) { 1332 1332 /* FLOGI needs to be 3 for WQE FCFI */ 1333 - ct = ((SLI4_CT_FCFI >> 1) & 1) | (SLI4_CT_FCFI & 1); 1333 + ct = SLI4_CT_FCFI; 1334 1334 bf_set(wqe_ct, &wqe->els_req.wqe_com, ct); 1335 1335 1336 1336 /* Set the fcfi to the fcfi we registered with */
+3 -3
drivers/scsi/lpfc/lpfc_sli.c
··· 10720 10720 10721 10721 /* Words 0 - 2 */ 10722 10722 bde = (struct ulp_bde64_le *)&cmdwqe->generic.bde; 10723 - bde->addr_low = cpu_to_le32(putPaddrLow(bmp->phys)); 10724 - bde->addr_high = cpu_to_le32(putPaddrHigh(bmp->phys)); 10723 + bde->addr_low = bpl->addr_low; 10724 + bde->addr_high = bpl->addr_high; 10725 10725 bde->type_size = cpu_to_le32(xmit_len); 10726 - bde->type_size |= cpu_to_le32(ULP_BDE64_TYPE_BLP_64); 10726 + bde->type_size |= cpu_to_le32(ULP_BDE64_TYPE_BDE_64); 10727 10727 10728 10728 /* Word 3 */ 10729 10729 cmdwqe->gen_req.request_payload_len = xmit_len;
+3
drivers/scsi/qla2xxx/qla_target.c
··· 3826 3826 3827 3827 spin_lock_irqsave(&cmd->cmd_lock, flags); 3828 3828 if (cmd->aborted) { 3829 + if (cmd->sg_mapped) 3830 + qlt_unmap_sg(vha, cmd); 3831 + 3829 3832 spin_unlock_irqrestore(&cmd->cmd_lock, flags); 3830 3833 /* 3831 3834 * It's normal to see 2 calls in this path: