Merge branch 'for-5.15-verbose-console' into for-linus

[linux-2.6-microblaze.git] / drivers / xen / xen-scsiback.c

diff --git a/drivers/xen/xen-scsiback.c b/drivers/xen/xen-scsiback.c
index 55a4763..61ce0d1 100644 (file)
--- a/drivers/xen/xen-scsiback.c
+++ b/drivers/xen/xen-scsiback.c
@@ -222,10 +222,10 @@ static void scsiback_print_status(char *sense_buffer, int errors,
 {
        struct scsiback_tpg *tpg = pending_req->v2p->tpg;
 
-       pr_err("[%s:%d] cmnd[0]=%02x -> st=%02x msg=%02x host=%02x drv=%02x\n",
+       pr_err("[%s:%d] cmnd[0]=%02x -> st=%02x msg=%02x host=%02x\n",
               tpg->tport->tport_name, pending_req->v2p->lun,
-              pending_req->cmnd[0], status_byte(errors), msg_byte(errors),
-              host_byte(errors), driver_byte(errors));
+              pending_req->cmnd[0], errors & 0xff, COMMAND_COMPLETE,
+              host_byte(errors));
 }
 
 static void scsiback_fast_flush_area(struct vscsibk_pend *req)
@@ -719,10 +719,10 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info,
                                result = DID_NO_CONNECT;
                                break;
                        default:
-                               result = DRIVER_ERROR;
+                               result = DID_ERROR;
                                break;
                        }
-                       scsiback_send_response(info, NULL, result << 24, 0,
+                       scsiback_send_response(info, NULL, result << 16, 0,
                                               ring_req.rqid);
                        return 1;
                }
@@ -732,7 +732,7 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info,
                        if (scsiback_gnttab_data_map(&ring_req, pending_req)) {
                                scsiback_fast_flush_area(pending_req);
                                scsiback_do_resp_with_sense(NULL,
-                                               DRIVER_ERROR << 24, 0, pending_req);
+                                               DID_ERROR << 16, 0, pending_req);
                                transport_generic_free_cmd(&pending_req->se_cmd, 0);
                        } else {
                                scsiback_cmd_exec(pending_req);
@@ -747,7 +747,7 @@ static int scsiback_do_cmd_fn(struct vscsibk_info *info,
                        break;
                default:
                        pr_err_ratelimited("invalid request\n");
-                       scsiback_do_resp_with_sense(NULL, DRIVER_ERROR << 24, 0,
+                       scsiback_do_resp_with_sense(NULL, DID_ERROR << 16, 0,
                                                    pending_req);
                        transport_generic_free_cmd(&pending_req->se_cmd, 0);
                        break;
@@ -1401,8 +1401,7 @@ static int scsiback_queue_status(struct se_cmd *se_cmd)
        if (se_cmd->sense_buffer &&
            ((se_cmd->se_cmd_flags & SCF_TRANSPORT_TASK_SENSE) ||
             (se_cmd->se_cmd_flags & SCF_EMULATED_TASK_SENSE)))
-               pending_req->result = (DRIVER_SENSE << 24) |
-                                     SAM_STAT_CHECK_CONDITION;
+               pending_req->result = SAM_STAT_CHECK_CONDITION;
        else
                pending_req->result = se_cmd->scsi_status;