ata: libata-eh: fix sloppy result type of ata_internal_cmd_timeout()
PATCH 1/1 ata: libata-eh: fix sloppy result type of ata_internal_cmd_timeout()
ata_internal_cmd_timeout() returns *unsigned long* timeout in ms, however ata_exec_internal_sg() passes that timeout to msecs_to_jiffies() that takes just *unsigned int*. Change ata_internal_cmd_timeout()'s result type to *unsigned int* as well, also updating the *struct* ata_eh_cmd_timeout_ent and the command timeout tables -- all timeouts fit into *unsigned int* but we have to change ULONG_MAX to UINT_MAX...
---
This patch is against the 'for-next' branch of Damien's 'libata.git' repo.
drivers/ata/libata-eh.c | 22 +++++++++++----------- drivers/ata/libata.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-)
drivers/ata/libata-eh.c +11 -11
@@ -86,36 +86,36 @@ static const unsigned long ata_eh_reset_ ULONG_MAX, /* > 1 min has elapsed, give up */ }; -static const unsigned long ata_eh_identify_timeouts[] = { +static const unsigned int ata_eh_identify_timeouts[] = {5000 ,/* covers > 99% of successes and not too boring on failures */ 10000 ,/* combined time till here is enough even for media access */ 30000 ,/* for true idiots */ -ULONG_MAX , +UINT_MAX , }; -static const unsigned long ata_eh_revalidate_timeouts[] = { +static const unsigned int ata_eh_revalidate_timeouts[] = {15000 ,/* Some drives are slow to read log pages when waking-up */ 15000 ,/* combined time till here is enough even for media access */ -ULONG_MAX , +UINT_MAX , }; -static const unsigned long ata_eh_flush_timeouts[] = { +static const unsigned int ata_eh_flush_timeouts[] = {15000 ,/* be generous with flush */ 15000 ,/* ditto */ 30000 ,/* and even more generous */ -ULONG_MAX , +UINT_MAX , }; -static const unsigned long ata_eh_other_timeouts[] = { +static const unsigned int ata_eh_other_timeouts[] = {5000 ,/* same rationale as identify timeout */ 10000 ,/* ditto */ /* but no merciful 30sec for other commands, it just isn't worth it */ -ULONG_MAX , +UINT_MAX , };struct ata_eh_cmd_timeout_ent {const u8 *commands; -const unsigned long *timeouts; +const unsigned int *timeouts; };/* The following table determines timeouts to use for EH internal
@@ -326,7 +326,7 @@ static int ata_lookup_timeout_table(u8 c* RETURNS: * Determined timeout. */ -unsigned long ata_internal_cmd_timeout (struct ata_device *dev,u8 cmd) +unsigned int ata_internal_cmd_timeout (struct ata_device *dev,u8 cmd) {struct ata_eh_context *ehc = &dev->link->eh_context;int ent =ata_lookup_timeout_table (cmd);
@@ -361,7 +361,7 @@ void ata_internal_cmd_timed_out(struct areturn ; idx = ehc->cmd_timeout_idx[dev->devno][ent]; -if (ata_eh_cmd_timeout_table[ent].timeouts[idx +1 ] !=ULONG_MAX ) +if (ata_eh_cmd_timeout_table[ent].timeouts[idx +1 ] !=UINT_MAX ) ehc->cmd_timeout_idx[dev->devno][ent]++; }
drivers/ata/libata.h +1 -1
@@ -132,7 +132,7 @@ int ata_scsi_dev_config(struct scsi_deviint __ata_scsi_queuecmd (struct scsi_cmnd *scmd,struct ata_device *dev);/* libata-eh.c */ -extern unsigned long ata_internal_cmd_timeout (struct ata_device *dev,u8 cmd); +extern unsigned int ata_internal_cmd_timeout (struct ata_device *dev,u8 cmd);extern void ata_internal_cmd_timed_out (struct ata_device *dev,u8 cmd);extern void ata_eh_acquire (struct ata_port *ap);extern void ata_eh_release (struct ata_port *ap);
Quoted 6 lines · Sergey Shtylyov
ata_internal_cmd_timeout()returns *unsigned long* timeout in ms, howeverata_exec_internal_sg()passes that timeout tomsecs_to_jiffies()that takes just *unsigned int*. Change ata_internal_cmd_timeout()'s result type to *unsigned int* as well, also updating the *struct*ata_eh_cmd_timeout_entand the command timeout tables -- all timeouts fit into *unsigned int* but we have to changeULONG_MAXtoUINT_MAX...
BTW, the patch saves 64 bytes of object code...
Quoted 1 line
Signed-off-by Sergey Shtylyov <[email protected]>
[...]
MBR, Sergey
Damien Le Moal
AppliedQuoted 8 lines · Sergey Shtylyov
ata_internal_cmd_timeout()returns *unsigned long* timeout in ms, howeverata_exec_internal_sg()passes that timeout tomsecs_to_jiffies()that takes just *unsigned int*. Change ata_internal_cmd_timeout()'s result type to *unsigned int* as well, also updating the *struct*ata_eh_cmd_timeout_entand the command timeout tables -- all timeouts fit into *unsigned int* but we have to changeULONG_MAXtoUINT_MAX...Signed-off-by Sergey Shtylyov <[email protected]>
Applied to for-5.20. Thanks !
Signature · 2 lines
Damien Le Moal Western Digital Research