direct-io.hg

changeset 4247:bc658811e45d

bitkeeper revision 1.1236.1.102 (423f0cf0IKBttbyFsA4dM4ZHz13vAQ)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Mon Mar 21 18:05:36 2005 +0000 (2005-03-21)
parents 7351314f8d57 e07b3423bc48
children 07d81708cc40
files linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c	Mon Mar 21 18:04:36 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c	Mon Mar 21 18:05:36 2005 +0000
     1.3 @@ -365,7 +365,7 @@ static int xlvbd_init_device(vdisk_t *xd
     1.4   */
     1.5  static int xlvbd_remove_device(int dev16)
     1.6  {
     1.7 -    int i, rc = 0, minor = MINOR(dev16);
     1.8 +    int i, rc = 0;
     1.9      struct gendisk *gd;
    1.10      struct block_device *bd;
    1.11      struct xlbd_disk_info *di;
    1.12 @@ -393,7 +393,6 @@ static int xlvbd_remove_device(int dev16
    1.13          goto out;
    1.14      }
    1.15  
    1.16 -    BUG_ON(minor != gd->first_minor);
    1.17      /* The VBD is mapped to an entire unit. */
    1.18      
    1.19      invalidate_partition(gd, 0);