Having the large CDB allocation logic in sd.c means that
scsi_io_completion does not have access to the command buffer. That in
turn causes garbage to be printed when a 32-byte command fails. Move the
command printing to sd_done where the command buffer is intact and
inform scsi_lib.c that no printing is necessary.
Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
---
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d892768..d716ff2 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -897,7 +897,8 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes)
scsi_print_result(cmd);
if (driver_byte(result) & DRIVER_SENSE)
scsi_print_sense("", cmd);
- scsi_print_command(cmd);
+ if (!cmd->device->prints_failed_commands)
+ scsi_print_command(cmd);
}
if (blk_end_request_err(req, error))
scsi_requeue_command(q, cmd);
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 255da53..ad15c2e 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1214,6 +1214,9 @@ static int sd_done(struct scsi_cmnd *SCpnt)
break;
}
out:
+ if (result)
+ scsi_print_command(SCpnt);
+
if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt))
sd_dif_complete(SCpnt, good_bytes);
@@ -2071,6 +2074,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
}
sdkp->first_scan = 0;
+ sdp->prints_failed_commands = 1;
/*
* We now have all cache related info, determine how we deal
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 7c44499..0d551a3 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -149,6 +149,7 @@ struct scsi_device {
unsigned last_sector_bug:1; /* do not use multisector accesses on
SD_LAST_BUGGY_SECTORS */
unsigned is_visible:1; /* is the device visible in sysfs */
+ unsigned prints_failed_commands:1; /* ULD prints failed commands */
DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
struct list_head event_list; /* asserted events */
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
