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

linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c

@@ -275,15 +275,14 @@ struct gendisk *xlvbd_alloc_gendisk(
     di->mi = mi;
     di->xd_device = disk->device;
 
-    if (((disk->info & (VDISK_CDROM|VDISK_REMOVABLE)) == 0) &&
-        ((minor & ((1 << mi->type->partn_shift) - 1)) == 0))
+    if ((minor & ((1 << mi->type->partn_shift) - 1)) == 0)
         nr_minors = 1 << mi->type->partn_shift;
 
     gd = alloc_disk(nr_minors);
     if (gd == NULL)
         goto out;
 
-    if (((disk->info & (VDISK_CDROM|VDISK_REMOVABLE)) != 0) || (nr_minors > 1))
+    if (nr_minors > 1)
         sprintf(gd->disk_name, "%s%c", mi->type->diskname,
                 'a' + mi->index * mi->type->disks_per_major +
                     (minor >> mi->type->partn_shift));