block: introduce blk_rq_is_passthrough

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

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 8188e5c71f75e0a7396b1326ca9d27e1008f1572..31629a7b728dd9ea6e0cf897bb729bcd94502ba1 100644 (file)
--- 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));
 
        /*