|
 |
3d7c23 |
From 24f7604a53a1c23739aca10b2ed8ff61cb6a9b02 Mon Sep 17 00:00:00 2001
|
|
|
3d7c23 |
From: Himanshu Madhani <hmadhani@redhat.com>
|
|
|
3d7c23 |
Date: Thu, 1 Aug 2019 15:55:33 -0400
|
|
|
3d7c23 |
Subject: [PATCH 073/124] [scsi] scsi: qla2xxx: Remove qla_tgt_cmd.data_work
|
|
|
3d7c23 |
and qla_tgt_cmd.data_work_free
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Message-id: <20190801155618.12650-74-hmadhani@redhat.com>
|
|
|
3d7c23 |
Patchwork-id: 267848
|
|
|
3d7c23 |
O-Subject: [RHEL 7.8 e-stor PATCH 073/118] scsi: qla2xxx: Remove qla_tgt_cmd.data_work and qla_tgt_cmd.data_work_free
|
|
|
3d7c23 |
Bugzilla: 1729270
|
|
|
3d7c23 |
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
|
|
3d7c23 |
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
From: Bart Van Assche <bvanassche@acm.org>
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Bugzilla 1729270
|
|
|
3d7c23 |
|
|
|
3d7c23 |
The 'data_work' and 'data_work_free' member variables are set but never
|
|
|
3d7c23 |
used. Hence remove both member variables. See also commit 6bcbb3174caa
|
|
|
3d7c23 |
("qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd use during TMR ABORT (v2)").
|
|
|
3d7c23 |
|
|
|
3d7c23 |
Cc: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3d7c23 |
Cc: Giridhar Malavali <gmalavali@marvell.com>
|
|
|
3d7c23 |
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
|
|
|
3d7c23 |
Acked-by: Himanshu Madhani <hmadhani@marvell.com>
|
|
|
3d7c23 |
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
|
|
|
3d7c23 |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
3d7c23 |
(cherry picked from commit bb63e47b6f6832f1eb5be4207c65a6f268e01059)
|
|
|
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.h | 2 --
|
|
|
3d7c23 |
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 2 --
|
|
|
3d7c23 |
2 files changed, 4 deletions(-)
|
|
|
3d7c23 |
|
|
|
3d7c23 |
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
|
|
|
3d7c23 |
index 7541e116009a..2779b9a83898 100644
|
|
|
3d7c23 |
--- a/drivers/scsi/qla2xxx/qla_target.h
|
|
|
3d7c23 |
+++ b/drivers/scsi/qla2xxx/qla_target.h
|
|
|
3d7c23 |
@@ -899,8 +899,6 @@ struct qla_tgt_cmd {
|
|
|
3d7c23 |
unsigned int cmd_sent_to_fw:1;
|
|
|
3d7c23 |
unsigned int cmd_in_wq:1;
|
|
|
3d7c23 |
unsigned int aborted:1;
|
|
|
3d7c23 |
- unsigned int data_work:1;
|
|
|
3d7c23 |
- unsigned int data_work_free:1;
|
|
|
3d7c23 |
unsigned int released:1;
|
|
|
3d7c23 |
|
|
|
3d7c23 |
struct scatterlist *sg; /* cmd data buffer SG vector */
|
|
|
3d7c23 |
diff --git a/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
|
|
|
3d7c23 |
index 4339cdcc3cb8..d61d02cd3f86 100644
|
|
|
3d7c23 |
--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
|
|
|
3d7c23 |
+++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
|
|
|
3d7c23 |
@@ -534,9 +534,7 @@ static void tcm_qla2xxx_handle_data_work(struct work_struct *work)
|
|
|
3d7c23 |
return;
|
|
|
3d7c23 |
}
|
|
|
3d7c23 |
|
|
|
3d7c23 |
- cmd->data_work = 1;
|
|
|
3d7c23 |
if (cmd->aborted) {
|
|
|
3d7c23 |
- cmd->data_work_free = 1;
|
|
|
3d7c23 |
spin_unlock_irqrestore(&cmd->cmd_lock, flags);
|
|
|
3d7c23 |
|
|
|
3d7c23 |
tcm_qla2xxx_free_cmd(cmd);
|
|
|
3d7c23 |
--
|
|
|
3d7c23 |
2.13.6
|
|
|
3d7c23 |
|