SCSI fixes for 5.5-rc3
Subsystems (4)
James Bottomley
maintainerFour fixes and one spelling update, all in drivers: 2 in lpfc and the rest in mp3sas, cxgbi and target.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Arnd Bergmann (1):
scsi: lpfc: fix build failure with DEBUGFS disabled
Colin Ian King (1):
scsi: lpfc: fix spelling mistakes of asynchronous
Dan Carpenter (1):
scsi: mpt3sas: Fix double free in attach error handling
Israel Rukshin (1):
scsi: target/iblock: Fix protection error with blocks greater than 512B
Varun Prakash (1):
scsi: libcxgbi: fix NULL pointer dereference in cxgbi_device_destroy()
And the diffstat:
drivers/scsi/cxgbi/libcxgbi.c | 3 ++- drivers/scsi/lpfc/lpfc_debugfs.c | 3 +-- drivers/scsi/lpfc/lpfc_init.c | 2 +- drivers/scsi/lpfc/lpfc_sli.c | 10 +++++----- drivers/scsi/mpt3sas/mpt3sas_base.c | 1 - drivers/target/target_core_iblock.c | 4 +++- 6 files changed, 12 insertions(+), 11 deletions(-)
With full diff below.
James
---
drivers/scsi/cxgbi/libcxgbi.c +2 -1
@@ -121,7 +121,8 @@ static inline void cxgbi_device_destroy(struct cxgbi_device *cdev) "cdev 0x%p, p# %u.\n", cdev, cdev->nports);cxgbi_hbas_remove (cdev);cxgbi_device_portmap_cleanup (cdev); -cxgbi_ppm_release (cdev->cdev2ppm (cdev)); +if (cdev->cdev2ppm) +cxgbi_ppm_release (cdev->cdev2ppm (cdev));if (cdev->pmap.max_connect)cxgbi_free_big_mem (cdev->pmap.port_csk);kfree (cdev);
drivers/scsi/lpfc/lpfc_debugfs.c +1 -2
@@ -5385,7 +5385,6 @@ static const struct file_operations lpfc_debugfs_ras_log = { .read = lpfc_debugfs_read, .release = lpfc_debugfs_ras_log_release, }; -#endif #undef lpfc_debugfs_op_dumpHBASlimstatic const struct file_operations lpfc_debugfs_op_dumpHBASlim = {
@@ -5557,7 +5556,7 @@ static const struct file_operations lpfc_idiag_op_extAcc = { .write = lpfc_idiag_extacc_write, .release = lpfc_idiag_cmd_release, }; - +#endif /* lpfc_idiag_mbxacc_dump_bsg_mbox - idiag debugfs dump bsg mailbox command * @phba: Pointer to HBA context object.
drivers/scsi/lpfc/lpfc_init.c +1 -1
@@ -5883,7 +5883,7 @@ void lpfc_sli4_async_event_proc(struct lpfc_hba *phba)break ;default :lpfc_printf_log (phba,KERN_ERR ,LOG_SLI , -"1804 Invalid asynchrous event code: " +"1804 Invalid asynchronous event code: " "x%x\n" ,bf_get (lpfc_trailer_code, &cq_event->cqe.mcqe_cmpl));break ;
drivers/scsi/lpfc/lpfc_sli.c +5 -5
@@ -8555,7 +8555,7 @@ lpfc_sli4_async_mbox_unblock(struct lpfc_hba *phba) psli->sli_flag &= ~LPFC_SLI_ASYNC_MBX_BLK ;spin_unlock_irq (&phba->hbalock); -/* wake up worker thread to post asynchronlous mailbox command */ +/* wake up worker thread to post asynchronous mailbox command */ lpfc_worker_wake_up (phba); }
@@ -8823,7 +8823,7 @@ lpfc_sli_issue_mbox_s4(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq,return rc; } -/* Now, interrupt mode asynchrous mailbox command */ +/* Now, interrupt mode asynchronous mailbox command */ rc =lpfc_mbox_cmd_check (phba, mboxq);if (rc) { lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI,
@@ -13112,11 +13112,11 @@ lpfc_cq_event_setup(struct lpfc_hba *phba, void *entry, int size) }/** -* lpfc_sli4_sp_handle_async_event - Handle an asynchroous event +* lpfc_sli4_sp_handle_async_event - Handle an asynchronous event * @phba: Pointer to HBA context object. * @cqe: Pointer to mailbox completion queue entry. * -* This routine process a mailbox completion queue entry with asynchrous +* This routine process a mailbox completion queue entry with asynchronous * event. * * Return: true if work posted to worker thread, otherwise false.
@@ -13270,7 +13270,7 @@ lpfc_sli4_sp_handle_mbox_event(struct lpfc_hba *phba, struct lpfc_mcqe *mcqe)* @cqe: Pointer to mailbox completion queue entry. * * This routine process a mailbox completion queue entry, it invokes the -* proper mailbox complete handling or asynchrous event handling routine +* proper mailbox complete handling or asynchronous event handling routine * according to the MCQE's async bit. * * Return: true if work posted to worker thread, otherwise false.
drivers/scsi/mpt3sas/mpt3sas_base.c +0 -1
@@ -5248,7 +5248,6 @@ _base_allocate_memory_pools(struct MPT3SAS_ADAPTER *ioc) &ct->chain_buffer_dma);if (!ct->chain_buffer) {ioc_err (ioc,"chain_lookup: pci_pool_alloc failed\n" ); -_base_release_memory_pools (ioc); goto out; } }
drivers/target/target_core_iblock.c +3 -1
@@ -646,7 +646,9 @@ iblock_alloc_bip(struct se_cmd *cmd, struct bio *bio, } bip->bip_iter.bi_size =bio_integrity_bytes (bi,bio_sectors (bio)); -bip_set_seed (bip, bio->bi_iter.bi_sector); +/* virtual start sector must be in integrity interval units */ +bip_set_seed (bip, bio->bi_iter.bi_sector >> + (bi->interval_exp -SECTOR_SHIFT ));pr_debug ("IBLOCK BIP Size: %u Sector: %llu\n" , bip->bip_iter.bi_size, (unsigned long long )bip->bip_iter.bi_sector);
The pull request you sent on Fri, 27 Dec 2019 14:57:08 -0800:
The pull request you sent on Fri, 27 Dec 2019 14:57:08 -0800:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/bf8d1cd4386535004c4afe7f03d37f9864c9940e
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker