|
 |
3d7c23 |
From e00f15274ba0277d0d9749b1155ff241cfc60b26 Mon Sep 17 00:00:00 2001
|
|
|
3d7c23 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Date: Thu, 1 Aug 2019 15:54:35 -0400
|
|
|
3d7c23 |
Subject: [PATCH 015/124] [scsi] scsi: qla2xxx: remove redundant null check on
|
|
|
3d7c23 |
pointer sess
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Message-id: <20190801155618.12650-16-hmadhani@redhat.com>
|
|
|
3d7c23 |
Patchwork-id: 267789
|
|
|
3d7c23 |
O-Subject: [RHEL 7.8 e-stor PATCH 015/118] scsi: qla2xxx: remove redundant null check on pointer sess
|
|
|
3d7c23 |
Bugzilla: 1729270
|
|
|
3d7c23 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3d7c23 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
From: Colin Ian King <colin.king@canonical.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Bugzilla 1729270
|
|
|
3d7c23 |
|
|
|
3d7c23 |
The null check on pointer sess and the subsequent call is redundant as sess
|
|
|
3d7c23 |
is null on all the the paths that lead to the out_term2 label. Hence the
|
|
|
3d7c23 |
null check and the call can be removed. Also remove the redundant setting
|
|
|
3d7c23 |
of sess to NULL as this is not required now.
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Detected by CoverityScan, CID#1420663 ("Logically dead code")
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Signed-off-by: Colin Ian King <colin.king@canonical.com>
|
|
|
3d7c23 |
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3d7c23 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3d7c23 |
(cherry picked from commit bb6abdd453e123bebdf949a03df5e846ecb5866b)
|
|
|
3d7c23 |
Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
3d7c23 |
---
|
|
|
3d7c23 |
drivers/scsi/qla2xxx/qla_target.c | 6 +-----
|
|
|
3d7c23 |
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
3d7c23 |
|
|
|
3d7c23 |
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
|
|
|
3d7c23 |
index 54894e235c0d..50235fd29e45 100644
|
|
|
3d7c23 |
--- a/drivers/scsi/qla2xxx/qla_target.c
|
|
|
3d7c23 |
+++ b/drivers/scsi/qla2xxx/qla_target.c
|
|
|
3d7c23 |
@@ -6317,7 +6317,7 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
|
|
|
3d7c23 |
struct atio_from_isp *a = &prm->tm_iocb2;
|
|
|
3d7c23 |
struct scsi_qla_host *vha = tgt->vha;
|
|
|
3d7c23 |
struct qla_hw_data *ha = vha->hw;
|
|
|
3d7c23 |
- struct fc_port *sess = NULL;
|
|
|
3d7c23 |
+ struct fc_port *sess;
|
|
|
3d7c23 |
unsigned long flags;
|
|
|
3d7c23 |
uint8_t *s_id = NULL; /* to hide compiler warnings */
|
|
|
3d7c23 |
int rc;
|
|
|
3d7c23 |
@@ -6343,7 +6343,6 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
|
|
|
3d7c23 |
goto out_term2;
|
|
|
3d7c23 |
} else {
|
|
|
3d7c23 |
if (sess->deleted) {
|
|
|
3d7c23 |
- sess = NULL;
|
|
|
3d7c23 |
goto out_term2;
|
|
|
3d7c23 |
}
|
|
|
3d7c23 |
|
|
|
3d7c23 |
@@ -6351,7 +6350,6 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
|
|
|
3d7c23 |
ql_dbg(ql_dbg_tgt_tmr, vha, 0xf020,
|
|
|
3d7c23 |
"%s: kref_get fail %8phC\n",
|
|
|
3d7c23 |
__func__, sess->port_name);
|
|
|
3d7c23 |
- sess = NULL;
|
|
|
3d7c23 |
goto out_term2;
|
|
|
3d7c23 |
}
|
|
|
3d7c23 |
}
|
|
|
3d7c23 |
@@ -6370,8 +6368,6 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
|
|
|
3d7c23 |
return;
|
|
|
3d7c23 |
|
|
|
3d7c23 |
out_term2:
|
|
|
3d7c23 |
- if (sess)
|
|
|
3d7c23 |
- ha->tgt.tgt_ops->put_sess(sess);
|
|
|
3d7c23 |
spin_unlock_irqrestore(&ha->tgt.sess_lock, flags);
|
|
|
3d7c23 |
out_term:
|
|
|
3d7c23 |
qlt_send_term_exchange(ha->base_qpair, NULL, &prm->tm_iocb2, 1, 0);
|
|
|
3d7c23 |
--
|
|
|
3d7c23 |
2.13.6
|
|
|
3d7c23 |
|