aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libata-eh.c
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2006-05-31 05:28:13 -0400
committerTejun Heo <htejun@gmail.com>2006-05-31 05:28:13 -0400
commit720ba12620ee09dce269adf4ad50958adac7bb54 (patch)
treef31a8b3da52195610bd244baf42a5fe2e26b0a36 /drivers/scsi/libata-eh.c
parent3e706399b03bd237d087d731d4b1b029e546b33d (diff)
[PATCH] libata-hp: update unload-unplug
Update unload unplug - driver unloading / PCI removal. This is done by ata_port_detach() which short-circuits EH, disables all devices and freezes the port. With this patch, EH and unloading/unplugging are properly synchronized. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers/scsi/libata-eh.c')
-rw-r--r--drivers/scsi/libata-eh.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index 70c132bef68e..30a83a57a12f 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
@@ -46,6 +46,7 @@
46#include "libata.h" 46#include "libata.h"
47 47
48static void __ata_port_freeze(struct ata_port *ap); 48static void __ata_port_freeze(struct ata_port *ap);
49static void ata_eh_finish(struct ata_port *ap);
49 50
50static void ata_ering_record(struct ata_ering *ering, int is_io, 51static void ata_ering_record(struct ata_ering *ering, int is_io,
51 unsigned int err_mask) 52 unsigned int err_mask)
@@ -242,8 +243,11 @@ void ata_scsi_error(struct Scsi_Host *host)
242 243
243 spin_unlock_irqrestore(hs_lock, flags); 244 spin_unlock_irqrestore(hs_lock, flags);
244 245
245 /* invoke EH */ 246 /* invoke EH. if unloading, just finish failed qcs */
246 ap->ops->error_handler(ap); 247 if (!(ap->flags & ATA_FLAG_UNLOADING))
248 ap->ops->error_handler(ap);
249 else
250 ata_eh_finish(ap);
247 251
248 /* Exception might have happend after ->error_handler 252 /* Exception might have happend after ->error_handler
249 * recovered the port but before this point. Repeat 253 * recovered the port but before this point. Repeat