ia64/xen-unstable

changeset 2220:9166d5ce37f3

bitkeeper revision 1.1159.1.48 (411c848c0EDRT7eJdbiXsiM284ZIbA)

2.6 blkfront fixes
author iap10@labyrinth.cl.cam.ac.uk
date Fri Aug 13 09:06:20 2004 +0000 (2004-08-13)
parents afbab8dc06bd
children 7bac86571809
files linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu Aug 12 22:35:16 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c	Fri Aug 13 09:06:20 2004 +0000
     1.3 @@ -69,12 +69,15 @@ static inline void flush_requests(void);
     1.4  
     1.5  static void kick_pending_request_queues(void);
     1.6  
     1.7 +int __init xlblk_init(void);
     1.8 +
     1.9  /**************************  KERNEL VERSION 2.6  **************************/
    1.10  
    1.11  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
    1.12  
    1.13  #define DISABLE_SCATTERGATHER() 
    1.14  
    1.15 +__initcall(xlblk_init);
    1.16  
    1.17  int blkif_open(struct inode *inode, struct file *filep)
    1.18  {
    1.19 @@ -322,12 +325,12 @@ static irqreturn_t blkif_int(int irq, vo
    1.20          case BLKIF_OP_READ:
    1.21          case BLKIF_OP_WRITE:
    1.22              if ( unlikely(bret->status != BLKIF_RSP_OKAY) )
    1.23 -                DPRINTK("Bad return from blkdev data request: %lx\n",
    1.24 +                DPRINTK("Bad return from blkdev data request: %x\n",
    1.25                          bret->status);
    1.26              req = (struct request *)bret->id;
    1.27              if ( unlikely(end_that_request_first
    1.28                            (req, 
    1.29 -                           (bret->status != BLKIF_RSP_OKAY),
    1.30 +                           (bret->status == BLKIF_RSP_OKAY),
    1.31                             req->hard_nr_sectors)) )
    1.32                  BUG();
    1.33              end_that_request_last(req);
    1.34 @@ -1145,7 +1148,6 @@ int __init xlblk_init(void)
    1.35  
    1.36      return 0;
    1.37  }
    1.38 -__initcall(xlblk_init);
    1.39  
    1.40  void blkdev_suspend(void)
    1.41  {