ia64/xen-unstable

changeset 5260:073dc14d65f6

bitkeeper revision 1.1159.258.163 (429dd4a8sp6_fuyZOAS4879Pd7C9sw)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/xen-2.0-testing.bk
author vh249@arcadians.cl.cam.ac.uk
date Wed Jun 01 15:30:48 2005 +0000 (2005-06-01)
parents 9d463569c705 eadd4af8ee1a
children 99d9ce2c0a65
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	Wed Jun 01 09:43:50 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c	Wed Jun 01 15:30:48 2005 +0000
     1.3 @@ -278,15 +278,14 @@ struct gendisk *xlvbd_alloc_gendisk(
     1.4      di->mi = mi;
     1.5      di->xd_device = disk->device;
     1.6  
     1.7 -    if ((VDISK_TYPE(disk->info) == VDISK_TYPE_DISK) &&
     1.8 -        ((minor & ((1 << mi->type->partn_shift) - 1)) == 0))
     1.9 +    if ((minor & ((1 << mi->type->partn_shift) - 1)) == 0)
    1.10          nr_minors = 1 << mi->type->partn_shift;
    1.11  
    1.12      gd = alloc_disk(nr_minors);
    1.13      if ( !gd )
    1.14          goto out;
    1.15  
    1.16 -    if ((VDISK_TYPE(disk->info) != VDISK_TYPE_DISK) || (nr_minors > 1))
    1.17 +    if (nr_minors > 1)
    1.18          sprintf(gd->disk_name, "%s%c", mi->type->diskname,
    1.19                  'a' + mi->index * mi->type->disks_per_major +
    1.20                      (minor >> mi->type->partn_shift));