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:
"Seven fixes: three in target, one on a sg error leg, two in qla2xxx
fixing warnings introduced in the last merge window and updating
MAINTAINERS and one in hisi_sas fixing a problem introduced by libata"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: sg: add sg_remove_request in sg_common_write
scsi: target: tcmu: reset_ring should reset TCMU_DEV_BIT_BROKEN
scsi: target: fix PR IN / READ FULL STATUS for FC
scsi: target: Write NULL to *port_nexus_ptr if no ISID
scsi: MAINTAINERS: Update qla2xxx FC-SCSI driver maintainer
scsi: qla2xxx: Fix regression warnings
scsi: hisi_sas: Fix build error without SATA_HOST

Linus Torvalds 50cc09c1 eeaa7625

+12 -10
+2 -1
MAINTAINERS
··· 13857 13857 F: drivers/scsi/qla1280.[ch] 13858 13858 13859 13859 QLOGIC QLA2XXX FC-SCSI DRIVER 13860 - M: hmadhani@marvell.com 13860 + M: Nilesh Javali <njavali@marvell.com> 13861 + M: GR-QLogic-Storage-Upstream@marvell.com 13861 13862 L: linux-scsi@vger.kernel.org 13862 13863 S: Supported 13863 13864 F: Documentation/scsi/LICENSE.qla2xxx
+1
drivers/scsi/hisi_sas/Kconfig
··· 6 6 select SCSI_SAS_LIBSAS 7 7 select BLK_DEV_INTEGRITY 8 8 depends on ATA 9 + select SATA_HOST 9 10 help 10 11 This driver supports HiSilicon's SAS HBA, including support based 11 12 on platform device
+2 -1
drivers/scsi/qla2xxx/qla_dbg.c
··· 2539 2539 { 2540 2540 va_list va; 2541 2541 struct va_format vaf; 2542 - char pbuf[64]; 2543 2542 2544 2543 va_start(va, fmt); 2545 2544 ··· 2546 2547 vaf.va = &va; 2547 2548 2548 2549 if (!ql_mask_match(level)) { 2550 + char pbuf[64]; 2551 + 2549 2552 if (vha != NULL) { 2550 2553 const struct pci_dev *pdev = vha->hw->pdev; 2551 2554 /* <module-name> <msg-id>:<host> Message */
-2
drivers/scsi/qla2xxx/qla_init.c
··· 3611 3611 ha->lr_distance = LR_DISTANCE_5K; 3612 3612 } 3613 3613 3614 - if (!vha->flags.init_done) 3615 - rc = QLA_SUCCESS; 3616 3614 out: 3617 3615 ql_dbg(ql_dbg_async, vha, 0x507b, 3618 3616 "SFP detect: %s-Range SFP %s (nvr=%x ll=%x lr=%x lrd=%x).\n",
-1
drivers/scsi/qla2xxx/qla_isr.c
··· 87 87 } 88 88 89 89 /* terminate exchange */ 90 - memset(rsp_els, 0, sizeof(*rsp_els)); 91 90 rsp_els->entry_type = ELS_IOCB_TYPE; 92 91 rsp_els->entry_count = 1; 93 92 rsp_els->nport_handle = ~0;
-2
drivers/scsi/qla2xxx/qla_mbx.c
··· 4894 4894 return QLA_MEMORY_ALLOC_FAILED; 4895 4895 } 4896 4896 4897 - memset(els_cmd_map, 0, ELS_CMD_MAP_SIZE); 4898 - 4899 4897 els_cmd_map[index] |= 1 << bit; 4900 4898 4901 4899 mcp->mb[0] = MBC_SET_RNID_PARAMS;
+3 -1
drivers/scsi/sg.c
··· 793 793 "sg_common_write: scsi opcode=0x%02x, cmd_size=%d\n", 794 794 (int) cmnd[0], (int) hp->cmd_len)); 795 795 796 - if (hp->dxfer_len >= SZ_256M) 796 + if (hp->dxfer_len >= SZ_256M) { 797 + sg_remove_request(sfp, srp); 797 798 return -EINVAL; 799 + } 798 800 799 801 k = sg_start_req(srp, cmnd); 800 802 if (k) {
+3 -2
drivers/target/target_core_fabric_lib.c
··· 63 63 * encoded TransportID. 64 64 */ 65 65 ptr = &se_nacl->initiatorname[0]; 66 - for (i = 0; i < 24; ) { 66 + for (i = 0; i < 23; ) { 67 67 if (!strncmp(&ptr[i], ":", 1)) { 68 68 i++; 69 69 continue; ··· 341 341 *p = tolower(*p); 342 342 p++; 343 343 } 344 - } 344 + } else 345 + *port_nexus_ptr = NULL; 345 346 346 347 return &buf[4]; 347 348 }
+1
drivers/target/target_core_user.c
··· 2073 2073 mb->cmd_tail = 0; 2074 2074 mb->cmd_head = 0; 2075 2075 tcmu_flush_dcache_range(mb, sizeof(*mb)); 2076 + clear_bit(TCMU_DEV_BIT_BROKEN, &udev->flags); 2076 2077 2077 2078 del_timer(&udev->cmd_timer); 2078 2079