[PATCH] libata: kill NULL qc handling from ->eng_timeout callbacks

->eng_timeout cannot be invoked with NULL qc anymore.  Add an
assertion in ata_scsi_error() and kill NULL qc handling from all
->eng_timeout callbacks.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index d67cc2fb5694..9d67c6768335 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -782,6 +782,7 @@ int ata_scsi_error(struct Scsi_Host *host)
         spin_lock_irqsave(&ap->host_set->lock, flags);
         assert(!(ap->flags & ATA_FLAG_IN_EH));
         ap->flags |= ATA_FLAG_IN_EH;
+        assert(ata_qc_from_tag(ap, ap->active_tag) != NULL);
         spin_unlock_irqrestore(&ap->host_set->lock, flags);
 
         ap->ops->eng_timeout(ap);