Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / device_handler / scsi_dh_hp_sw.c

diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index 084062bb8ee9de341ded2d0bb2d1b4b2ea897ecb..e9d9fea9e272baf797bf5e95d5f729e29eae90eb 100644 (file)
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -120,7 +120,7 @@ retry:
        if (!req)
                return SCSI_DH_RES_TEMP_UNAVAIL;
 
-       req->cmd_type = REQ_TYPE_BLOCK_PC;
+       blk_rq_set_block_pc(req);
        req->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
                          REQ_FAILFAST_DRIVER;
        req->cmd_len = COMMAND_SIZE(TEST_UNIT_READY);
@@ -250,7 +250,7 @@ static int hp_sw_start_stop(struct hp_sw_dh_data *h)
        if (!req)
                return SCSI_DH_RES_TEMP_UNAVAIL;
 
-       req->cmd_type = REQ_TYPE_BLOCK_PC;
+       blk_rq_set_block_pc(req);
        req->cmd_flags |= REQ_FAILFAST_DEV | REQ_FAILFAST_TRANSPORT |
                          REQ_FAILFAST_DRIVER;
        req->cmd_len = COMMAND_SIZE(START_STOP);