| Message ID | AS8PR10MB49524AAB4C8016E4AFF17FFB9D2D9@AS8PR10MB4952.EURPRD10.PROD.OUTLOOK.COM |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] qla2xxx: Remove unused qla_sess_op_cmd_list from scsi_qla_host_t | expand |
> On Feb 8, 2022, at 7:18 AM, Chesnokov Gleb <Chesnokov.G@raidix.com> wrote: > > The qla_sess_op_cmd_list was introduced in 8b2f5ff3d05c > ("qla2xxx: cleanup cmd in qla workqueue before processing TMR"). > > Then the usage of this list was dropped in fb35265b12bb > ("scsi: qla2xxx: Remove session creation redundant code"). > > Thus, remove this list since it is no longer used. > > Signed-off-by: Gleb Chesnokov <Chesnokov.G@raidix.com> > --- > drivers/scsi/qla2xxx/qla_def.h | 1 - > drivers/scsi/qla2xxx/qla_os.c | 1 - > drivers/scsi/qla2xxx/qla_target.c | 20 -------------------- > 3 files changed, 22 deletions(-) > > diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h > index 9ebf4a234d9a..7d8ebabb7b40 100644 > --- a/drivers/scsi/qla2xxx/qla_def.h > +++ b/drivers/scsi/qla2xxx/qla_def.h > @@ -4906,7 +4906,6 @@ typedef struct scsi_qla_host { > > /* list of commands waiting on workqueue */ > struct list_head qla_cmd_list; > - struct list_head qla_sess_op_cmd_list; > struct list_head unknown_atio_list; > spinlock_t cmd_list_lock; > struct delayed_work unknown_atio_work; > diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c > index abcd30917263..579379a3c554 100644 > --- a/drivers/scsi/qla2xxx/qla_os.c > +++ b/drivers/scsi/qla2xxx/qla_os.c > @@ -4949,7 +4949,6 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht, > INIT_LIST_HEAD(&vha->work_list); > INIT_LIST_HEAD(&vha->list); > INIT_LIST_HEAD(&vha->qla_cmd_list); > - INIT_LIST_HEAD(&vha->qla_sess_op_cmd_list); > INIT_LIST_HEAD(&vha->logo_list); > INIT_LIST_HEAD(&vha->plogi_ack_list); > INIT_LIST_HEAD(&vha->qp_list); > diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c > index 8993d438e0b7..d5dad6e6d4cc 100644 > --- a/drivers/scsi/qla2xxx/qla_target.c > +++ b/drivers/scsi/qla2xxx/qla_target.c > @@ -2026,17 +2026,6 @@ static void abort_cmds_for_lun(struct scsi_qla_host *vha, u64 lun, be_id_t s_id) > > key = sid_to_key(s_id); > spin_lock_irqsave(&vha->cmd_list_lock, flags); > - list_for_each_entry(op, &vha->qla_sess_op_cmd_list, cmd_list) { > - uint32_t op_key; > - u64 op_lun; > - > - op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id); > - op_lun = scsilun_to_int( > - (struct scsi_lun *)&op->atio.u.isp24.fcp_cmnd.lun); > - if (op_key == key && op_lun == lun) > - op->aborted = true; > - } > - > list_for_each_entry(op, &vha->unknown_atio_list, cmd_list) { > uint32_t op_key; > u64 op_lun; > @@ -4727,15 +4716,6 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id) > ((u32)s_id->b.al_pa)); > > spin_lock_irqsave(&vha->cmd_list_lock, flags); > - list_for_each_entry(op, &vha->qla_sess_op_cmd_list, cmd_list) { > - uint32_t op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id); > - > - if (op_key == key) { > - op->aborted = true; > - count++; > - } > - } > - > list_for_each_entry(op, &vha->unknown_atio_list, cmd_list) { > uint32_t op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id); > > -- > 2.35.1 Looks Good. Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com> -- Himanshu Madhani Oracle Linux Engineering
> The qla_sess_op_cmd_list was introduced in 8b2f5ff3d05c > ("qla2xxx: cleanup cmd in qla workqueue before processing TMR"). > > Then the usage of this list was dropped in fb35265b12bb > ("scsi: qla2xxx: Remove session creation redundant code"). > > Thus, remove this list since it is no longer used. Applied to 5.18/scsi-staging, thanks!
On Tue, 8 Feb 2022 15:18:38 +0000, Chesnokov Gleb wrote: > The qla_sess_op_cmd_list was introduced in 8b2f5ff3d05c > ("qla2xxx: cleanup cmd in qla workqueue before processing TMR"). > > Then the usage of this list was dropped in fb35265b12bb > ("scsi: qla2xxx: Remove session creation redundant code"). > > Thus, remove this list since it is no longer used. > > [...] Applied to 5.18/scsi-queue, thanks! [1/1] qla2xxx: Remove unused qla_sess_op_cmd_list from scsi_qla_host_t https://git.kernel.org/mkp/scsi/c/fa1d43f396f7
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 9ebf4a234d9a..7d8ebabb7b40 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h @@ -4906,7 +4906,6 @@ typedef struct scsi_qla_host { /* list of commands waiting on workqueue */ struct list_head qla_cmd_list; - struct list_head qla_sess_op_cmd_list; struct list_head unknown_atio_list; spinlock_t cmd_list_lock; struct delayed_work unknown_atio_work; diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index abcd30917263..579379a3c554 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -4949,7 +4949,6 @@ struct scsi_qla_host *qla2x00_create_host(struct scsi_host_template *sht, INIT_LIST_HEAD(&vha->work_list); INIT_LIST_HEAD(&vha->list); INIT_LIST_HEAD(&vha->qla_cmd_list); - INIT_LIST_HEAD(&vha->qla_sess_op_cmd_list); INIT_LIST_HEAD(&vha->logo_list); INIT_LIST_HEAD(&vha->plogi_ack_list); INIT_LIST_HEAD(&vha->qp_list); diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 8993d438e0b7..d5dad6e6d4cc 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -2026,17 +2026,6 @@ static void abort_cmds_for_lun(struct scsi_qla_host *vha, u64 lun, be_id_t s_id) key = sid_to_key(s_id); spin_lock_irqsave(&vha->cmd_list_lock, flags); - list_for_each_entry(op, &vha->qla_sess_op_cmd_list, cmd_list) { - uint32_t op_key; - u64 op_lun; - - op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id); - op_lun = scsilun_to_int( - (struct scsi_lun *)&op->atio.u.isp24.fcp_cmnd.lun); - if (op_key == key && op_lun == lun) - op->aborted = true; - } - list_for_each_entry(op, &vha->unknown_atio_list, cmd_list) { uint32_t op_key; u64 op_lun; @@ -4727,15 +4716,6 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id) ((u32)s_id->b.al_pa)); spin_lock_irqsave(&vha->cmd_list_lock, flags); - list_for_each_entry(op, &vha->qla_sess_op_cmd_list, cmd_list) { - uint32_t op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id); - - if (op_key == key) { - op->aborted = true; - count++; - } - } - list_for_each_entry(op, &vha->unknown_atio_list, cmd_list) { uint32_t op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id);
The qla_sess_op_cmd_list was introduced in 8b2f5ff3d05c ("qla2xxx: cleanup cmd in qla workqueue before processing TMR"). Then the usage of this list was dropped in fb35265b12bb ("scsi: qla2xxx: Remove session creation redundant code"). Thus, remove this list since it is no longer used. Signed-off-by: Gleb Chesnokov <Chesnokov.G@raidix.com> --- drivers/scsi/qla2xxx/qla_def.h | 1 - drivers/scsi/qla2xxx/qla_os.c | 1 - drivers/scsi/qla2xxx/qla_target.c | 20 -------------------- 3 files changed, 22 deletions(-)