6 files changed, 10 insertions, 10 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index cbc0c5fe5a60..c611412a8de9 100644
--- 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;
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 3d8d2153b448..7bfbcfa7af40 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -238,7 +238,7 @@ void scsi_finish_command(struct scsi_cmnd *cmd)
                                 "(result %x)\n", cmd->result));
 
         good_bytes = scsi_bufflen(cmd);
-        if (cmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
+        if (!blk_rq_is_passthrough(cmd->request)) {
                 int old_good_bytes = good_bytes;
                 drv = scsi_cmd_to_driver(cmd);
                 if (drv->done)
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 4b40f746d534..b4ce7bb5d2a9 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1106,7 +1106,7 @@ static int scsi_request_sense(struct scsi_cmnd *scmd)
 
 static int scsi_eh_action(struct scsi_cmnd *scmd, int rtn)
 {
-        if (scmd->request->cmd_type != REQ_TYPE_BLOCK_PC) {
+        if (!blk_rq_is_passthrough(scmd->request)) {
                 struct scsi_driver *sdrv = scsi_cmd_to_driver(scmd);
                 if (sdrv->eh_action)
                         rtn = sdrv->eh_action(scmd, rtn);
@@ -1746,7 +1746,7 @@ check_type:
          * the check condition was retryable.
          */
         if (scmd->request->cmd_flags & REQ_FAILFAST_DEV ||
-            scmd->request->cmd_type == REQ_TYPE_BLOCK_PC)
+            blk_rq_is_passthrough(scmd->request))
                 return 1;
         else
                 return 0;
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 8188e5c71f75..31629a7b728d 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -582,7 +582,7 @@ void scsi_run_host_queues(struct Scsi_Host *shost)
 
 static void scsi_uninit_cmd(struct scsi_cmnd *cmd)
 {
-        if (cmd->request->cmd_type == REQ_TYPE_FS) {
+        if (!blk_rq_is_passthrough(cmd->request)) {
                 struct scsi_driver *drv = scsi_cmd_to_driver(cmd);
 
                 if (drv->uninit_command)
@@ -806,7 +806,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                         sense_deferred = scsi_sense_is_deferred(&sshdr);
         }
 
-        if (req->cmd_type == REQ_TYPE_BLOCK_PC) { /* SG_IO ioctl from block level */
+        if (blk_rq_is_passthrough(req)) {
                 if (result) {
                         if (sense_valid) {
                                 /*
@@ -847,7 +847,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
                 error = __scsi_error_from_host_byte(cmd, result);
         }
 
-        /* no bidi support for !REQ_TYPE_BLOCK_PC yet */
+        /* no bidi support for !blk_rq_is_passthrough yet */
         BUG_ON(blk_bidi_rq(req));
 
         /*
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 8702d9cf8040..11c0dfb3dfa3 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -4499,7 +4499,7 @@ static int pqi_scsi_queue_command(struct Scsi_Host *shost,
         if (pqi_is_logical_device(device)) {
                 raid_bypassed = false;
                 if (device->offload_enabled &&
-                        scmd->request->cmd_type == REQ_TYPE_FS) {
+                                !blk_rq_is_passthrough(scmd->request)) {
                         rc = pqi_raid_bypass_submit_scsi_cmd(ctrl_info, device,
                                 scmd, queue_group);
                         if (rc == 0 ||
diff --git a/drivers/scsi/sun3_scsi.c b/drivers/scsi/sun3_scsi.c
index 88db6992420e..bcf7d05d1aab 100644
--- a/drivers/scsi/sun3_scsi.c
+++ b/drivers/scsi/sun3_scsi.c
@@ -260,7 +260,7 @@ static int sun3scsi_dma_xfer_len(struct NCR5380_hostdata *hostdata,
 {
         int wanted_len = cmd->SCp.this_residual;
 
-        if (wanted_len < DMA_MIN_SIZE || cmd->request->cmd_type != REQ_TYPE_FS)
+        if (wanted_len < DMA_MIN_SIZE || blk_rq_is_passthrough(cmd->request))
                 return 0;
 
         return wanted_len;