summaryrefslogtreecommitdiffstats
path: root/drivers/ata/libata-eh.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-01-29 20:31:35 +0900
committerJeff Garzik <jgarzik@redhat.com>2009-02-02 23:04:19 -0500
commitcf9a590a9eae3b99ca77d8db17afd2d7dbdd0986 (patch)
tree793d23cfe978d8048243baddd57b4ec8979c5e14 /drivers/ata/libata-eh.c
parentc2c7a89c5eabaea8c0c2aa0c1069e510144513ab (diff)
downloadop-kernel-dev-cf9a590a9eae3b99ca77d8db17afd2d7dbdd0986.zip
op-kernel-dev-cf9a590a9eae3b99ca77d8db17afd2d7dbdd0986.tar.gz
libata: add no penalty retry request for EH device handling routines
Let -EAGAIN from EH device handling routines trigger EH retry without consuming its tries count. This will be used to implement link SPD horkage which requires hardreset to adjust SPD without affecting other EH decisions. As it bypasses the forward progress guarantee provided by the tries count, the requester is responsible for ensuring forward progress. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-eh.c')
-rw-r--r--drivers/ata/libata-eh.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index caa1e9f..ce2ef04 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -3035,7 +3035,11 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)
{
struct ata_eh_context *ehc = &dev->link->eh_context;
- ehc->tries[dev->devno]--;
+ /* -EAGAIN from EH routine indicates retry without prejudice.
+ * The requester is responsible for ensuring forward progress.
+ */
+ if (err != -EAGAIN)
+ ehc->tries[dev->devno]--;
switch (err) {
case -ENODEV:
OpenPOWER on IntegriCloud