The patch titled
libata: don't whine if ->prereset() returns -ENOENT
has been added to the -mm tree. Its filename is
libata-dont-whine-if-prereset-returns-enoent.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: libata: don't whine if ->prereset() returns -ENOENT
From: Tejun Heo <htejun@xxxxxxxxx>
->prereset() returns -ENOENT to tell libata that the port is empty and
reset sequencing should be stopped. This is not an error condition.
Update ata_eh_reset() such that it sets device classes to ATA_DEV_NONE
and return success in on -ENOENT. This makes spurious error message
go away.
1. I think these ports should be made dummy instead of returning
-ENOENT on prereset(). -ENOENT from prereset() was a hack to keep
ata_piix's behavior unchanged while converting it to new EH. If no one
objcts, I'll convert similar usages to use dummy ports after new init
model and drop -ENOENT hack in #upstream.
2. -ENODEV sounds more appropriate. Why have I used -ENOENT. :-)
Signed-off-by: Tejun Heo <htejun@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/ata/libata-eh.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff -puN drivers/ata/libata-eh.c~libata-dont-whine-if-prereset-returns-enoent drivers/ata/libata-eh.c
--- a/drivers/ata/libata-eh.c~libata-dont-whine-if-prereset-returns-enoent
+++ a/drivers/ata/libata-eh.c
@@ -1648,8 +1648,14 @@ static int ata_eh_reset(struct ata_port
rc = prereset(ap, jiffies + ATA_EH_PRERESET_TIMEOUT);
if (rc) {
if (rc == -ENOENT) {
- ata_port_printk(ap, KERN_DEBUG, "port disabled. ignoring.\n");
+ ata_port_printk(ap, KERN_DEBUG,
+ "port disabled. ignoring.\n");
ap->eh_context.i.action &= ~ATA_EH_RESET_MASK;
+
+ for (i = 0; i < ATA_MAX_DEVICES; i++)
+ classes[i] = ATA_DEV_NONE;
+
+ rc = 0;
} else
ata_port_printk(ap, KERN_ERR,
"prereset failed (errno=%d)\n", rc);
_
Patches currently in -mm which might be from htejun@xxxxxxxxx are
origin.patch
git-libata-all.patch
sata_nv-add-back-some-verbosity-into-adma-error_handler.patch
libata-dont-whine-if-prereset-returns-enoent.patch
introduce-config_has_dma.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
