diff options
author | Tejun Heo <htejun@gmail.com> | 2006-09-30 18:07:17 +0900 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-12-01 22:40:29 -0500 |
commit | 309afcb5c87b5a41da51cc0c36f61c0e0d43ca9a (patch) | |
tree | 21566a73f25ec3b91163c5a0ba0252e7079c7370 /drivers/ata/libata-scsi.c | |
parent | 722420fe6e2ab63bebc5a9ea346016b59076d75d (diff) | |
download | blackbird-op-linux-309afcb5c87b5a41da51cc0c36f61c0e0d43ca9a.tar.gz blackbird-op-linux-309afcb5c87b5a41da51cc0c36f61c0e0d43ca9a.zip |
[PATCH] libata: make user scan wait for scan to complete
Make user scan wait for scan to complete. This way user can wait for
warm plug request to complete and is prevented from causing EH event
storm by repetitively issuing scan request while EH is in progress.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Fajun Chen <fajunchen@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-scsi.c')
-rw-r--r-- | drivers/ata/libata-scsi.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 47ea111d5ace..6b2553dae489 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -3182,10 +3182,12 @@ static int ata_scsi_user_scan(struct Scsi_Host *shost, unsigned int channel, rc = -EINVAL; } - if (rc == 0) + if (rc == 0) { ata_port_schedule_eh(ap); - - spin_unlock_irqrestore(ap->lock, flags); + spin_unlock_irqrestore(ap->lock, flags); + ata_port_wait_eh(ap); + } else + spin_unlock_irqrestore(ap->lock, flags); return rc; } |