ia64/xen-unstable

changeset 5258:f3d83aed87fa

bitkeeper revision 1.1629 (429dcce9xCwGMwnshlCHuyiV7vxpFA)

Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into arcadians.cl.cam.ac.uk:/local/scratch-2/vh249/xen-unstable.bk
author vh249@arcadians.cl.cam.ac.uk
date Wed Jun 01 14:57:45 2005 +0000 (2005-06-01)
parents 79fea09c3b44 cb48c33361cd
children d65ff8dafa15 14d754e3b044
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 14:44:07 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c	Wed Jun 01 14:57:45 2005 +0000
     1.3 @@ -275,15 +275,14 @@ struct gendisk *xlvbd_alloc_gendisk(
     1.4      di->mi = mi;
     1.5      di->xd_device = disk->device;
     1.6  
     1.7 -    if (((disk->info & (VDISK_CDROM|VDISK_REMOVABLE)) == 0) &&
     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 == NULL)
    1.14          goto out;
    1.15  
    1.16 -    if (((disk->info & (VDISK_CDROM|VDISK_REMOVABLE)) != 0) || (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));