]> Pileus Git - ~andy/linux/commitdiff
[SCSI] qlogicfas: Close narrow race in release
authorMatthew Wilcox <matthew@wil.cx>
Wed, 15 Aug 2007 18:56:59 +0000 (12:56 -0600)
committerJames Bottomley <jejb@mulgrave.localdomain>
Fri, 12 Oct 2007 18:51:26 +0000 (14:51 -0400)
We were releasing the IRQ before removing the host, so commands could
still be coming in which would never be seen by the interrupt handler.
Just remove the host before releasing the IRQ to close this race.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/qlogicfas.c

index 94baca840efe45308070d964c4fb8612c9208198..1e874f1fb5c64a403fd6e7da8365edce51b929df 100644 (file)
@@ -166,6 +166,7 @@ static int qlogicfas_release(struct Scsi_Host *shost)
 {
        struct qlogicfas408_priv *priv = get_priv_by_host(shost);
 
+       scsi_remove_host(shost);
        if (shost->irq) {
                qlogicfas408_disable_ints(priv);        
                free_irq(shost->irq, shost);
@@ -174,7 +175,6 @@ static int qlogicfas_release(struct Scsi_Host *shost)
                free_dma(shost->dma_channel);
        if (shost->io_port && shost->n_io_port)
                release_region(shost->io_port, shost->n_io_port);
-       scsi_remove_host(shost);
        scsi_host_put(shost);
 
        return 0;