leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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-23-bvanassche@acm.org
Acked-by: Don Brace <don.brace@microchip.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bart Van Assche 2021-08-09 16:03:25 -07:00 committed by Martin K. Petersen
parent 1effbface9
commit 84090d42c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/hpsa.c
View File

@ -5686,7 +5686,7 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
/* Get the ptr to our adapter structure out of cmd->host. */ /* Get the ptr to our adapter structure out of cmd->host. */
h = sdev_to_hba(cmd->device); h = sdev_to_hba(cmd->device);
BUG_ON(cmd->request->tag < 0); BUG_ON(scsi_cmd_to_rq(cmd)->tag < 0);
dev = cmd->device->hostdata; dev = cmd->device->hostdata;
if (!dev) { if (!dev) {
@ -5729,7 +5729,7 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
* and is therefore a brand-new command. * and is therefore a brand-new command.
*/ */
if (likely(cmd->retries == 0 && if (likely(cmd->retries == 0 &&
!blk_rq_is_passthrough(cmd->request) && !blk_rq_is_passthrough(scsi_cmd_to_rq(cmd)) &&
h->acciopath_status)) { h->acciopath_status)) {
/* Submit with the retry_pending flag unset. */ /* Submit with the retry_pending flag unset. */
rc = hpsa_ioaccel_submit(h, c, cmd, false); rc = hpsa_ioaccel_submit(h, c, cmd, false);
@ -5894,7 +5894,7 @@ static int hpsa_scsi_add_host(struct ctlr_info *h)
*/ */
static int hpsa_get_cmd_index(struct scsi_cmnd *scmd) static int hpsa_get_cmd_index(struct scsi_cmnd *scmd)
{ {
int idx = scmd->request->tag; int idx = scsi_cmd_to_rq(scmd)->tag;
if (idx < 0) if (idx < 0)
return idx; return idx;