OSDN Git Service

scsi: qla2xxx: remove redundant null check on pointer sess
authorColin Ian King <colin.king@canonical.com>
Fri, 15 Feb 2019 09:52:32 +0000 (09:52 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 19 Feb 2019 23:58:35 +0000 (18:58 -0500)
The null check on pointer sess and the subsequent call is redundant as sess
is null on all the the paths that lead to the out_term2 label.  Hence the
null check and the call can be removed.  Also remove the redundant setting
of sess to NULL as this is not required now.

Detected by CoverityScan, CID#1420663 ("Logically dead code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/qla2xxx/qla_target.c

index 7051b0d..582d166 100644 (file)
@@ -6343,7 +6343,7 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
        struct atio_from_isp *a = &prm->tm_iocb2;
        struct scsi_qla_host *vha = tgt->vha;
        struct qla_hw_data *ha = vha->hw;
-       struct fc_port *sess = NULL;
+       struct fc_port *sess;
        unsigned long flags;
        uint8_t *s_id = NULL; /* to hide compiler warnings */
        int rc;
@@ -6369,7 +6369,6 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
                        goto out_term2;
        } else {
                if (sess->deleted) {
-                       sess = NULL;
                        goto out_term2;
                }
 
@@ -6377,7 +6376,6 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
                        ql_dbg(ql_dbg_tgt_tmr, vha, 0xf020,
                            "%s: kref_get fail %8phC\n",
                             __func__, sess->port_name);
-                       sess = NULL;
                        goto out_term2;
                }
        }
@@ -6396,8 +6394,6 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
        return;
 
 out_term2:
-       if (sess)
-               ha->tgt.tgt_ops->put_sess(sess);
        spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
 out_term:
        qlt_send_term_exchange(ha->base_qpair, NULL, &prm->tm_iocb2, 1, 0);