Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (bf8d1cd4) · Commits · 戴 / test

drivers/scsi/cxgbi/libcxgbi.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -121,6 +121,7 @@ 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);
		if (cdev->cdev2ppm)
		cxgbi_ppm_release(cdev->cdev2ppm(cdev));
		if (cdev->pmap.max_connect)
		cxgbi_free_big_mem(cdev->pmap.port_csk);

drivers/scsi/lpfc/lpfc_debugfs.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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_dumpHBASlim
		static 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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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 @@ out_no_mqe_complete:
		* @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

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}

Admin message