[Xen-changelog] remove assertion that CDROM devices have no partition.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1159.287.1, 2005/06/01 16:24:54+01:00, vh249@xxxxxxxxxxxxxxxxxxxxxx

        remove assertion that CDROM devices have no partition.
        
        Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>



 vbd.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c 
b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c        2005-06-08 
18:02:09 -04:00
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c        2005-06-08 
18:02:09 -04:00
@@ -278,15 +278,14 @@
     di->mi = mi;
     di->xd_device = disk->device;
 
-    if ((VDISK_TYPE(disk->info) == VDISK_TYPE_DISK) &&
-        ((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 )
         goto out;
 
-    if ((VDISK_TYPE(disk->info) != VDISK_TYPE_DISK) || (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));

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog