Commit 1effbfac authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

scsi: hisi_sas: Use scsi_cmd_to_rq() instead of scsi_cmnd.request

Prepare for removal of the request pointer by using scsi_cmd_to_rq()
instead. This patch does not change any functionality.

Link: https://lore.kernel.org/r/20210809230355.8186-22-bvanassche@acm.orgAcked-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e1c9f0cf
...@@ -185,7 +185,7 @@ static int hisi_sas_slot_index_alloc(struct hisi_hba *hisi_hba, ...@@ -185,7 +185,7 @@ static int hisi_sas_slot_index_alloc(struct hisi_hba *hisi_hba,
void *bitmap = hisi_hba->slot_index_tags; void *bitmap = hisi_hba->slot_index_tags;
if (scsi_cmnd) if (scsi_cmnd)
return scsi_cmnd->request->tag; return scsi_cmd_to_rq(scsi_cmnd)->tag;
spin_lock(&hisi_hba->lock); spin_lock(&hisi_hba->lock);
index = find_next_zero_bit(bitmap, hisi_hba->slot_index_count, index = find_next_zero_bit(bitmap, hisi_hba->slot_index_count,
...@@ -449,7 +449,7 @@ static int hisi_sas_task_prep(struct sas_task *task, ...@@ -449,7 +449,7 @@ static int hisi_sas_task_prep(struct sas_task *task,
unsigned int dq_index; unsigned int dq_index;
u32 blk_tag; u32 blk_tag;
blk_tag = blk_mq_unique_tag(scmd->request); blk_tag = blk_mq_unique_tag(scsi_cmd_to_rq(scmd));
dq_index = blk_mq_unique_tag_to_hwq(blk_tag); dq_index = blk_mq_unique_tag_to_hwq(blk_tag);
*dq_pointer = dq = &hisi_hba->dq[dq_index]; *dq_pointer = dq = &hisi_hba->dq[dq_index];
} else { } else {
......
...@@ -1153,7 +1153,7 @@ static void fill_prot_v3_hw(struct scsi_cmnd *scsi_cmnd, ...@@ -1153,7 +1153,7 @@ static void fill_prot_v3_hw(struct scsi_cmnd *scsi_cmnd,
{ {
unsigned char prot_op = scsi_get_prot_op(scsi_cmnd); unsigned char prot_op = scsi_get_prot_op(scsi_cmnd);
unsigned int interval = scsi_prot_interval(scsi_cmnd); unsigned int interval = scsi_prot_interval(scsi_cmnd);
u32 lbrt_chk_val = t10_pi_ref_tag(scsi_cmnd->request); u32 lbrt_chk_val = t10_pi_ref_tag(scsi_cmd_to_rq(scsi_cmnd));
switch (prot_op) { switch (prot_op) {
case SCSI_PROT_READ_INSERT: case SCSI_PROT_READ_INSERT:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment