direct-io.hg

changeset 1683:90021ce6f017

bitkeeper revision 1.1041.5.11 (40eacd9fZF8vOabxL_0gJXpgUypPQw)

Fix free_irq() calls to pass the correct dev_id.
author kaf24@scramble.cl.cam.ac.uk
date Tue Jul 06 16:04:47 2004 +0000 (2004-07-06)
parents bc15d455752f
children 59e06517a011
files linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c
line diff
     1.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h	Tue Jul 06 15:14:34 2004 +0000
     1.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/common.h	Tue Jul 06 16:04:47 2004 +0000
     1.3 @@ -15,11 +15,11 @@
     1.4  #include <asm/io.h>
     1.5  #include "../blkif.h"
     1.6  
     1.7 -#if 0
     1.8 +#if 1
     1.9  #define ASSERT(_p) \
    1.10      if ( !(_p) ) { printk("Assertion '%s' failed, line %d, file %s", #_p , \
    1.11      __LINE__, __FILE__); *(int*)0=0; }
    1.12 -#define DPRINTK(_f, _a...) printk("(file=%s, line=%d) " _f, \
    1.13 +#define DPRINTK(_f, _a...) printk(KERN_ALERT "(file=%s, line=%d) " _f, \
    1.14                             __FILE__ , __LINE__ , ## _a )
    1.15  #else
    1.16  #define ASSERT(_p) ((void)0)
     2.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c	Tue Jul 06 15:14:34 2004 +0000
     2.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/backend/interface.c	Tue Jul 06 16:04:47 2004 +0000
     2.3 @@ -217,7 +217,7 @@ int blkif_disconnect(blkif_be_disconnect
     2.4          blkif->status = DISCONNECTING;
     2.5          blkif->disconnect_rspid = rsp_id;
     2.6          wmb(); /* Let other CPUs see the status change. */
     2.7 -        free_irq(blkif->irq, NULL);
     2.8 +        free_irq(blkif->irq, blkif);
     2.9          blkif_deschedule(blkif);
    2.10          blkif_put(blkif);
    2.11      }
     3.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c	Tue Jul 06 15:14:34 2004 +0000
     3.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/blkif/frontend/main.c	Tue Jul 06 16:04:47 2004 +0000
     3.3 @@ -616,7 +616,7 @@ static void blkif_status_change(blkif_fe
     3.4  
     3.5              printk(KERN_INFO "VBD driver recovery in progress\n");
     3.6              
     3.7 -            /* Prevent new requests being issued until we've fixed things up. */
     3.8 +            /* Prevent new requests being issued until we fix things up. */
     3.9              spin_lock_irq(&io_request_lock);
    3.10              recovery = 1;
    3.11              blkif_state = BLKIF_STATE_DISCONNECTED;
     4.1 --- a/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c	Tue Jul 06 15:14:34 2004 +0000
     4.2 +++ b/linux-2.4.26-xen-sparse/arch/xen/drivers/netif/backend/interface.c	Tue Jul 06 16:04:47 2004 +0000
     4.3 @@ -266,7 +266,7 @@ int netif_disconnect(netif_be_disconnect
     4.4          netif->disconnect_rspid = rsp_id;
     4.5          wmb(); /* Let other CPUs see the status change. */
     4.6          netif_stop_queue(netif->dev);
     4.7 -        free_irq(netif->irq, NULL);
     4.8 +        free_irq(netif->irq, netif);
     4.9          netif_deschedule(netif);
    4.10          netif_put(netif);
    4.11      }