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

Pull SCSI fixes from James Bottomley:
"Four fixes and one spelling update, all in drivers: two in lpfc and
the rest in mp3sas, cxgbi and target"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: target/iblock: Fix protection error with blocks greater than 512B
scsi: libcxgbi: fix NULL pointer dereference in cxgbi_device_destroy()
scsi: lpfc: fix spelling mistakes of asynchronous
scsi: lpfc: fix build failure with DEBUGFS disabled
scsi: mpt3sas: Fix double free in attach error handling

Changed files
+12 -11
drivers
+2 -1
drivers/scsi/cxgbi/libcxgbi.c
··· 121 121 "cdev 0x%p, p# %u.\n", cdev, cdev->nports); 122 122 cxgbi_hbas_remove(cdev); 123 123 cxgbi_device_portmap_cleanup(cdev); 124 - cxgbi_ppm_release(cdev->cdev2ppm(cdev)); 124 + if (cdev->cdev2ppm) 125 + cxgbi_ppm_release(cdev->cdev2ppm(cdev)); 125 126 if (cdev->pmap.max_connect) 126 127 cxgbi_free_big_mem(cdev->pmap.port_csk); 127 128 kfree(cdev);
+1 -2
drivers/scsi/lpfc/lpfc_debugfs.c
··· 5385 5385 .read = lpfc_debugfs_read, 5386 5386 .release = lpfc_debugfs_ras_log_release, 5387 5387 }; 5388 - #endif 5389 5388 5390 5389 #undef lpfc_debugfs_op_dumpHBASlim 5391 5390 static const struct file_operations lpfc_debugfs_op_dumpHBASlim = { ··· 5556 5557 .write = lpfc_idiag_extacc_write, 5557 5558 .release = lpfc_idiag_cmd_release, 5558 5559 }; 5559 - 5560 + #endif 5560 5561 5561 5562 /* lpfc_idiag_mbxacc_dump_bsg_mbox - idiag debugfs dump bsg mailbox command 5562 5563 * @phba: Pointer to HBA context object.
+1 -1
drivers/scsi/lpfc/lpfc_init.c
··· 5883 5883 break; 5884 5884 default: 5885 5885 lpfc_printf_log(phba, KERN_ERR, LOG_SLI, 5886 - "1804 Invalid asynchrous event code: " 5886 + "1804 Invalid asynchronous event code: " 5887 5887 "x%x\n", bf_get(lpfc_trailer_code, 5888 5888 &cq_event->cqe.mcqe_cmpl)); 5889 5889 break;
+5 -5
drivers/scsi/lpfc/lpfc_sli.c
··· 8555 8555 psli->sli_flag &= ~LPFC_SLI_ASYNC_MBX_BLK; 8556 8556 spin_unlock_irq(&phba->hbalock); 8557 8557 8558 - /* wake up worker thread to post asynchronlous mailbox command */ 8558 + /* wake up worker thread to post asynchronous mailbox command */ 8559 8559 lpfc_worker_wake_up(phba); 8560 8560 } 8561 8561 ··· 8823 8823 return rc; 8824 8824 } 8825 8825 8826 - /* Now, interrupt mode asynchrous mailbox command */ 8826 + /* Now, interrupt mode asynchronous mailbox command */ 8827 8827 rc = lpfc_mbox_cmd_check(phba, mboxq); 8828 8828 if (rc) { 8829 8829 lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI, ··· 13112 13112 } 13113 13113 13114 13114 /** 13115 - * lpfc_sli4_sp_handle_async_event - Handle an asynchroous event 13115 + * lpfc_sli4_sp_handle_async_event - Handle an asynchronous event 13116 13116 * @phba: Pointer to HBA context object. 13117 13117 * @cqe: Pointer to mailbox completion queue entry. 13118 13118 * 13119 - * This routine process a mailbox completion queue entry with asynchrous 13119 + * This routine process a mailbox completion queue entry with asynchronous 13120 13120 * event. 13121 13121 * 13122 13122 * Return: true if work posted to worker thread, otherwise false. ··· 13270 13270 * @cqe: Pointer to mailbox completion queue entry. 13271 13271 * 13272 13272 * This routine process a mailbox completion queue entry, it invokes the 13273 - * proper mailbox complete handling or asynchrous event handling routine 13273 + * proper mailbox complete handling or asynchronous event handling routine 13274 13274 * according to the MCQE's async bit. 13275 13275 * 13276 13276 * Return: true if work posted to worker thread, otherwise false.
-1
drivers/scsi/mpt3sas/mpt3sas_base.c
··· 5248 5248 &ct->chain_buffer_dma); 5249 5249 if (!ct->chain_buffer) { 5250 5250 ioc_err(ioc, "chain_lookup: pci_pool_alloc failed\n"); 5251 - _base_release_memory_pools(ioc); 5252 5251 goto out; 5253 5252 } 5254 5253 }
+3 -1
drivers/target/target_core_iblock.c
··· 646 646 } 647 647 648 648 bip->bip_iter.bi_size = bio_integrity_bytes(bi, bio_sectors(bio)); 649 - bip_set_seed(bip, bio->bi_iter.bi_sector); 649 + /* virtual start sector must be in integrity interval units */ 650 + bip_set_seed(bip, bio->bi_iter.bi_sector >> 651 + (bi->interval_exp - SECTOR_SHIFT)); 650 652 651 653 pr_debug("IBLOCK BIP Size: %u Sector: %llu\n", bip->bip_iter.bi_size, 652 654 (unsigned long long)bip->bip_iter.bi_sector);