Skip to content

Commit cbba5b0

Browse files
hreineckeChristoph Hellwig
authored and
Christoph Hellwig
committed
libata: use __scsi_format_command()
libata already uses an internal buffer, so we should be using __scsi_format_command() here. Tested-by: Robert Elliott <[email protected]> Reviewed-by: Robert Elliott <[email protected]> Acked-by: Tejun Heo <[email protected]> Signed-off-by: Hannes Reinecke <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 9e5ed2a commit cbba5b0

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

drivers/ata/libata-eh.c

+7-10
Original file line numberDiff line numberDiff line change
@@ -2482,6 +2482,7 @@ static void ata_eh_link_report(struct ata_link *link)
24822482
struct ata_queued_cmd *qc = __ata_qc_from_tag(ap, tag);
24832483
struct ata_taskfile *cmd = &qc->tf, *res = &qc->result_tf;
24842484
const u8 *cdb = qc->cdb;
2485+
size_t cdb_len = qc->dev->cdb_len;
24852486
char data_buf[20] = "";
24862487
char cdb_buf[70] = "";
24872488

@@ -2509,16 +2510,12 @@ static void ata_eh_link_report(struct ata_link *link)
25092510
}
25102511

25112512
if (ata_is_atapi(qc->tf.protocol)) {
2512-
if (qc->scsicmd)
2513-
scsi_print_command(qc->scsicmd);
2514-
else
2515-
snprintf(cdb_buf, sizeof(cdb_buf),
2516-
"cdb %02x %02x %02x %02x %02x %02x %02x %02x "
2517-
"%02x %02x %02x %02x %02x %02x %02x %02x\n ",
2518-
cdb[0], cdb[1], cdb[2], cdb[3],
2519-
cdb[4], cdb[5], cdb[6], cdb[7],
2520-
cdb[8], cdb[9], cdb[10], cdb[11],
2521-
cdb[12], cdb[13], cdb[14], cdb[15]);
2513+
if (qc->scsicmd) {
2514+
cdb = qc->scsicmd->cmnd;
2515+
cdb_len = qc->scsicmd->cmd_len;
2516+
}
2517+
__scsi_format_command(cdb_buf, sizeof(cdb_buf),
2518+
cdb, cdb_len);
25222519
} else {
25232520
const char *descr = ata_get_cmd_descript(cmd->command);
25242521
if (descr)

0 commit comments

Comments
 (0)