Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / drivers / scsi / hpsa.c

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index f135a10..3faa87f 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -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. */
        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;
        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.
         */
        if (likely(cmd->retries == 0 &&
-                       !blk_rq_is_passthrough(cmd->request) &&
+                       !blk_rq_is_passthrough(scsi_cmd_to_rq(cmd)) &&
                        h->acciopath_status)) {
                /* Submit with the retry_pending flag unset. */
                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)
 {
-       int idx = scmd->request->tag;
+       int idx = scsi_cmd_to_rq(scmd)->tag;
 
        if (idx < 0)
                return idx;