]>
Commit | Line | Data |
---|---|---|
1 | From a568d1d2e2aff4f114b087c06bfd350e945ad6cf Mon Sep 17 00:00:00 2001 | |
2 | From: Tejun Heo <tj@kernel.org> | |
3 | Date: Tue, 21 Oct 2008 20:37:21 +0900 | |
4 | Subject: [PATCH] libata-eh: fix slave link EH action mask handling | |
5 | References: bnc#441420 | |
6 | ||
7 | Slave link action mask is transferred to master link and all the EH | |
8 | actions are taken by the master link. ata_eh_about_to_do() and | |
9 | ata_eh_done() are called with ATA_EH_ALL_ACTIONS to clear the slave | |
10 | link actions during transfer. This always sets ATA_PFLAG_RECOVERED | |
11 | flag causing spurious "EH complete" messages. | |
12 | ||
13 | Don't set ATA_PFLAG_RECOVERED for slave link actions. | |
14 | ||
15 | Signed-off-by: Tejun Heo <tj@kernel.org> | |
16 | Signed-off-by: Jeff Garzik <jgarzik@redhat.com> | |
17 | Signed-off-by: Tejun Heo <teheo@suse.de> | |
18 | --- | |
19 | drivers/ata/libata-eh.c | 5 ++++- | |
20 | 1 file changed, 4 insertions(+), 1 deletion(-) | |
21 | ||
22 | --- a/drivers/ata/libata-eh.c | |
23 | +++ b/drivers/ata/libata-eh.c | |
24 | @@ -1200,7 +1200,10 @@ void ata_eh_about_to_do(struct ata_link | |
25 | ||
26 | ata_eh_clear_action(link, dev, ehi, action); | |
27 | ||
28 | - if (!(ehc->i.flags & ATA_EHI_QUIET)) | |
29 | + /* About to take EH action, set RECOVERED. Ignore actions on | |
30 | + * slave links as master will do them again. | |
31 | + */ | |
32 | + if (!(ehc->i.flags & ATA_EHI_QUIET) && link != ap->slave_link) | |
33 | ap->pflags |= ATA_PFLAG_RECOVERED; | |
34 | ||
35 | spin_unlock_irqrestore(ap->lock, flags); |