openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] lpfc 8.3.32: lpfc_sli.c: add missing jumps to mempool_free 

Incorporate patch originally supplied by Julia Lawall <Julia.Lawall@lip6.fr>
http://marc.info/?l=linux-scsi&m=133572879711140&w=2

"It appears that mempool_free should be performed on these failures as on
 the other exists from the containing functions."

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
James Smart 2012-06-12 13:54:02 -04:00 committed by James Bottomley
parent eb47aa2c21
commit 4f4c18634d
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/scsi/lpfc/lpfc_sli.c
View File

@ -12228,8 +12228,10 @@ lpfc_cq_create(struct lpfc_hba *phba, struct lpfc_queue *cq,
lpfc_printf_log(phba, KERN_ERR, LOG_SLI, lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
"0361 Unsupported CQ count. (%d)\n", "0361 Unsupported CQ count. (%d)\n",
cq->entry_count); cq->entry_count);
if (cq->entry_count < 256) if (cq->entry_count < 256) {
return -EINVAL; status = -EINVAL;
goto out;
}
/* otherwise default to smallest count (drop through) */ /* otherwise default to smallest count (drop through) */
case 256: case 256:
bf_set(lpfc_cq_context_count, &cq_create->u.request.context, bf_set(lpfc_cq_context_count, &cq_create->u.request.context,
@ -12420,8 +12422,10 @@ lpfc_mq_create(struct lpfc_hba *phba, struct lpfc_queue *mq,
lpfc_printf_log(phba, KERN_ERR, LOG_SLI, lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
"0362 Unsupported MQ count. (%d)\n", "0362 Unsupported MQ count. (%d)\n",
mq->entry_count); mq->entry_count);
if (mq->entry_count < 16) if (mq->entry_count < 16) {
return -EINVAL; status = -EINVAL;
goto out;
}
/* otherwise default to smallest count (drop through) */ /* otherwise default to smallest count (drop through) */
case 16: case 16:
bf_set(lpfc_mq_context_ring_size, bf_set(lpfc_mq_context_ring_size,
@ -12710,8 +12714,10 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq,
lpfc_printf_log(phba, KERN_ERR, LOG_SLI, lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
"2535 Unsupported RQ count. (%d)\n", "2535 Unsupported RQ count. (%d)\n",
hrq->entry_count); hrq->entry_count);
if (hrq->entry_count < 512) if (hrq->entry_count < 512) {
return -EINVAL; status = -EINVAL;
goto out;
}
/* otherwise default to smallest count (drop through) */ /* otherwise default to smallest count (drop through) */
case 512: case 512:
bf_set(lpfc_rq_context_rqe_count, bf_set(lpfc_rq_context_rqe_count,
@ -12791,8 +12797,10 @@ lpfc_rq_create(struct lpfc_hba *phba, struct lpfc_queue *hrq,
lpfc_printf_log(phba, KERN_ERR, LOG_SLI, lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
"2536 Unsupported RQ count. (%d)\n", "2536 Unsupported RQ count. (%d)\n",
drq->entry_count); drq->entry_count);
if (drq->entry_count < 512) if (drq->entry_count < 512) {
return -EINVAL; status = -EINVAL;
goto out;
}
/* otherwise default to smallest count (drop through) */ /* otherwise default to smallest count (drop through) */
case 512: case 512:
bf_set(lpfc_rq_context_rqe_count, bf_set(lpfc_rq_context_rqe_count,