block: introduce blk_rq_is_passthrough

[mirror_ubuntu-artful-kernel.git] / drivers / scsi / hpsa.c

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index cbc0c5fe5a60188515dab3dd99be83ce62732e1c..c611412a8de96a6d6054c64f6961301c1d8c1ebc 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5539,8 +5539,8 @@ static int hpsa_scsi_queue_command(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
         * Retries always go down the normal I/O path.
         */
        if (likely(cmd->retries == 0 &&
-               cmd->request->cmd_type == REQ_TYPE_FS &&
-               h->acciopath_status)) {
+                       !blk_rq_is_passthrough(cmd->request) &&
+                       h->acciopath_status)) {
                rc = hpsa_ioaccel_submit(h, c, cmd, scsi3addr);
                if (rc == 0)
                        return 0;