Merge tag 'block-5.14-2021-07-08' of git://git.kernel.dk/linux-block

[uclinux-h8/linux.git] / drivers / scsi / scsi_lib.c

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 6b994ba..c9a91a5 100644 (file)
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -215,7 +215,7 @@ int __scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
 
        req = blk_get_request(sdev->request_queue,
                        data_direction == DMA_TO_DEVICE ?
-                       REQ_OP_SCSI_OUT : REQ_OP_SCSI_IN,
+                       REQ_OP_DRV_OUT : REQ_OP_DRV_IN,
                        rq_flags & RQF_PM ? BLK_MQ_REQ_PM : 0);
        if (IS_ERR(req))
                return PTR_ERR(req);
@@ -543,7 +543,7 @@ static bool scsi_end_request(struct request *req, blk_status_t error,
        if (blk_queue_add_random(q))
                add_disk_randomness(req->rq_disk);
 
-       if (!blk_rq_is_scsi(req)) {
+       if (!blk_rq_is_passthrough(req)) {
                WARN_ON_ONCE(!(cmd->flags & SCMD_INITIALIZED));
                cmd->flags &= ~SCMD_INITIALIZED;
        }
@@ -1113,7 +1113,7 @@ void scsi_init_command(struct scsi_device *dev, struct scsi_cmnd *cmd)
        bool in_flight;
        int budget_token = cmd->budget_token;
 
-       if (!blk_rq_is_scsi(rq) && !(flags & SCMD_INITIALIZED)) {
+       if (!blk_rq_is_passthrough(rq) && !(flags & SCMD_INITIALIZED)) {
                flags |= SCMD_INITIALIZED;
                scsi_initialize_rq(rq);
        }
@@ -1554,7 +1554,7 @@ static blk_status_t scsi_prepare_cmd(struct request *req)
         * Special handling for passthrough commands, which don't go to the ULP
         * at all:
         */
-       if (blk_rq_is_scsi(req))
+       if (blk_rq_is_passthrough(req))
                return scsi_setup_scsi_cmnd(sdev, req);
 
        if (sdev->handler && sdev->handler->prep_fn) {