Skip to content

Commit

Permalink
libata: fix off-by-one in error categorization
Browse files Browse the repository at this point in the history
ATA_ECAT_DUBIOUS_BASE was too high by one and thus all DUBIOUS error
categorizations were wrong.  This passed test because only ATA_BUS and
UNK_DEV were used during testing and the ones after them - ATA_BUS and
an overflowed entry - behaved similarly.

This patch fixes the problem by adding DUBIOUS_NONE category and use
it as base.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Jan 23, 2008
1 parent b710a1f commit 75f9caf
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions drivers/ata/libata-eh.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,11 @@ enum {
ATA_ECAT_ATA_BUS = 1,
ATA_ECAT_TOUT_HSM = 2,
ATA_ECAT_UNK_DEV = 3,
ATA_ECAT_DUBIOUS_ATA_BUS = 4,
ATA_ECAT_DUBIOUS_TOUT_HSM = 5,
ATA_ECAT_DUBIOUS_UNK_DEV = 6,
ATA_ECAT_NR = 7,

ATA_ECAT_DUBIOUS_BASE = ATA_ECAT_DUBIOUS_ATA_BUS,
ATA_ECAT_DUBIOUS_NONE = 4,
ATA_ECAT_DUBIOUS_ATA_BUS = 5,
ATA_ECAT_DUBIOUS_TOUT_HSM = 6,
ATA_ECAT_DUBIOUS_UNK_DEV = 7,
ATA_ECAT_NR = 8,
};

/* Waiting in ->prereset can never be reliable. It's sometimes nice
Expand Down Expand Up @@ -1499,7 +1498,7 @@ static int ata_eh_categorize_error(unsigned int eflags, unsigned int err_mask,
*xfer_ok = 1;

if (!*xfer_ok)
base = ATA_ECAT_DUBIOUS_BASE;
base = ATA_ECAT_DUBIOUS_NONE;

if (err_mask & AC_ERR_ATA_BUS)
return base + ATA_ECAT_ATA_BUS;
Expand Down

0 comments on commit 75f9caf

Please sign in to comment.