SCSI fixes for 5.0-rc4
Subsystems (7)
James Bottomley
maintainerFive minor bug fixes. The libfc one is a tiny memory leak, the zfcp one is an incorrect user visible parameter and the rest are on error legs or obscure features.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Dan Carpenter (2):
scsi: 53c700: pass correct "dev" to dma_alloc_attrs()
scsi: bnx2fc: Fix error handling in probe()
Douglas Gilbert (1):
scsi: scsi_debug: fix write_same with virtual_gb problem
Ming Lu (1):
scsi: libfc: free skb when receiving invalid flogi resp
Steffen Maier (1):
scsi: zfcp: fix sysfs block queue limit output for max_segment_size
And the diffstat
drivers/s390/scsi/zfcp_aux.c | 1 - drivers/s390/scsi/zfcp_scsi.c | 2 ++ drivers/scsi/53c700.c | 2 +- drivers/scsi/bnx2fc/bnx2fc_io.c | 4 ++-- drivers/scsi/libfc/fc_lport.c | 6 +++--- drivers/scsi/scsi_debug.c | 41 +++++++++++++++++++++-------------------- 6 files changed, 29 insertions(+), 27 deletions(-)
With full diff below.
James
---
drivers/s390/scsi/zfcp_aux.c +0 -1
@@ -403,7 +403,6 @@ struct zfcp_adapter *zfcp_adapter_enqueue(struct ccw_device *ccw_device) goto failed;/* report size limit per scatter-gather segment */ - adapter->dma_parms.max_segment_size =ZFCP_QDIO_SBALE_LEN ; adapter->ccw_device->dev.dma_parms = &adapter->dma_parms; adapter->stat_read_buf_num =FSF_STATUS_READS_RECOM ;
drivers/s390/scsi/zfcp_scsi.c +2 -0
@@ -428,6 +428,8 @@ static struct scsi_host_template zfcp_scsi_host_template = { .max_sectors = (((QDIO_MAX_ELEMENTS_PER_BUFFER - 1) * ZFCP_QDIO_MAX_SBALS_PER_REQ) - 2) * 8,/* GCD, adjusted later */ +/* report size limit per scatter-gather segment */ + .max_segment_size = ZFCP_QDIO_SBALE_LEN, .dma_boundary = ZFCP_QDIO_SBALE_LEN - 1, .shost_attrs = zfcp_sysfs_shost_attrs, .sdev_attrs = zfcp_sysfs_sdev_attrs,
drivers/scsi/53c700.c +1 -1
@@ -295,7 +295,7 @@ NCR_700_detect(struct scsi_host_template *tpnt,if (tpnt->sdev_attrs ==NULL ) tpnt->sdev_attrs = NCR_700_dev_attrs; - memory =dma_alloc_attrs (hostdata->dev,TOTAL_MEM_SIZE , &pScript, + memory =dma_alloc_attrs (dev,TOTAL_MEM_SIZE , &pScript,GFP_KERNEL ,DMA_ATTR_NON_CONSISTENT );if (memory ==NULL ) {printk (KERN_ERR "53c700: Failed to allocate memory for driver, detaching\n" );
drivers/scsi/bnx2fc/bnx2fc_io.c +2 -2
@@ -240,6 +240,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)return NULL ; } + cmgr->hba = hba; cmgr->free_list =kcalloc (arr_sz,sizeof (*cmgr->free_list),GFP_KERNEL );if (!cmgr->free_list) {
@@ -256,7 +257,6 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba) goto mem_err; } - cmgr->hba = hba; cmgr->cmds = (struct bnx2fc_cmd **)(cmgr +1 );for (i =0 ; i < arr_sz; i++) {
@@ -295,7 +295,7 @@ struct bnx2fc_cmd_mgr *bnx2fc_cmd_mgr_alloc(struct bnx2fc_hba *hba)/* Allocate pool of io_bdts - one for each bnx2fc_cmd */ mem_size = num_ios *sizeof (struct io_bdt *); - cmgr->io_bdt_pool =kmalloc (mem_size,GFP_KERNEL ); + cmgr->io_bdt_pool =kzalloc (mem_size,GFP_KERNEL );if (!cmgr->io_bdt_pool) { printk(KERN_ERR PFX "failed to alloc io_bdt_pool\n"); goto mem_err;
drivers/scsi/libfc/fc_lport.c +3 -3
@@ -1726,14 +1726,14 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp, fc_frame_payload_op(fp) != ELS_LS_ACC) {FC_LPORT_DBG (lport,"FLOGI not accepted or bad response\n" );fc_lport_error (lport, fp); - goto err; + goto out; } flp =fc_frame_payload_get (fp,sizeof (*flp));if (!flp) {FC_LPORT_DBG (lport,"FLOGI bad response\n" );fc_lport_error (lport, fp); - goto err; + goto out; } mfs = ntohs(flp->fl_csp.sp_bb_data) &
@@ -1743,7 +1743,7 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,FC_LPORT_DBG (lport,"FLOGI bad mfs:%hu response, " "lport->mfs:%hu\n" , mfs, lport->mfs);fc_lport_error (lport, fp); - goto err; + goto out; }if (mfs <= lport->mfs) {
drivers/scsi/scsi_debug.c +21 -20
91 lines not on this page · raw message
The pull request you sent on Fri, 01 Feb 2019 16:06:45 -0800:
The pull request you sent on Fri, 01 Feb 2019 16:06:45 -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/3cde55ee7921609331178c84cca485491c97df2a
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker