From: Ed L. Cashin <ecashin@coraid.com>
Date: Tue, 7 Feb 2006 16:37:24 +0000 (-0500)
Subject: [PATCH] aoe [2/3]: don't request ATA device ID on ATA error
X-Git-Tag: v2.6.17-rc1~666^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9d41965b783474dba9fcf3eb02e5eb60540e6ff6;p=linux-2.6-omap-h63xx.git

[PATCH] aoe [2/3]: don't request ATA device ID on ATA error

On an ATA error response, take the device down instead of
sending another ATA device identify command.

Signed-off-by: "Ed L. Cashin" <ecashin@coraid.com>
---

diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c
index 207aabcd1f4..39da28d344f 100644
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
@@ -517,6 +517,8 @@ aoecmd_ata_rsp(struct sk_buff *skb)
 	ahout = (struct aoe_atahdr *) (f->data + sizeof(struct aoe_hdr));
 	buf = f->buf;
 
+	if (ahout->cmdstat == WIN_IDENTIFY)
+		d->flags &= ~DEVFL_PAUSE;
 	if (ahin->cmdstat & 0xa9) {	/* these bits cleared on success */
 		printk(KERN_CRIT "aoe: aoecmd_ata_rsp: ata error cmd=%2.2Xh "
 			"stat=%2.2Xh from e%ld.%ld\n", 
@@ -549,7 +551,6 @@ aoecmd_ata_rsp(struct sk_buff *skb)
 				return;
 			}
 			ataid_complete(d, (char *) (ahin+1));
-			d->flags &= ~DEVFL_PAUSE;
 			break;
 		default:
 			printk(KERN_INFO "aoe: aoecmd_ata_rsp: unrecognized "