lkml.org 
[lkml]   [2020]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 332/639] scsi: qla2xxx: Fix error handling in qlt_alloc_qfull_cmd()
    Date
    From: Bart Van Assche <bvanassche@acm.org>

    [ Upstream commit c04466c17142d5eb566984372b9a5003d1900fe3 ]

    The test "if (!cmd)" is not useful because it is guaranteed that cmd !=
    NULL. Instead of testing the cmd pointer, rely on the tag to decide
    whether or not command allocation failed.

    Cc: Himanshu Madhani <hmadhani@marvell.com>
    Cc: Giridhar Malavali <gmalavali@marvell.com>
    Fixes: 33e799775593 ("qla2xxx: Add support for QFull throttling and Term Exchange retry") # v3.18.
    Signed-off-by: Bart Van Assche <bvanassche@acm.org>
    Acked-by: Himanshu Madhani <hmadhani@marvell.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/qla2xxx/qla_target.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
    index bbbe1996620bf..c925ca7875374 100644
    --- a/drivers/scsi/qla2xxx/qla_target.c
    +++ b/drivers/scsi/qla2xxx/qla_target.c
    @@ -5334,11 +5334,7 @@ qlt_alloc_qfull_cmd(struct scsi_qla_host *vha,
    se_sess = sess->se_sess;

    tag = sbitmap_queue_get(&se_sess->sess_tag_pool, &cpu);
    - if (tag < 0)
    - return;
    -
    - cmd = &((struct qla_tgt_cmd *)se_sess->sess_cmd_map)[tag];
    - if (!cmd) {
    + if (tag < 0) {
    ql_dbg(ql_dbg_io, vha, 0x3009,
    "qla_target(%d): %s: Allocation of cmd failed\n",
    vha->vp_idx, __func__);
    @@ -5353,6 +5349,7 @@ qlt_alloc_qfull_cmd(struct scsi_qla_host *vha,
    return;
    }

    + cmd = &((struct qla_tgt_cmd *)se_sess->sess_cmd_map)[tag];
    memset(cmd, 0, sizeof(struct qla_tgt_cmd));

    qlt_incr_num_pend_cmds(vha);
    --
    2.20.1


    \
     
     \ /
      Last update: 2020-01-24 12:19    [W:3.724 / U:1.440 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site