diff options
| author | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-06-01 14:57:08 +0000 |
|---|---|---|
| committer | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-06-01 14:57:08 +0000 |
| commit | 32915112d6c92459de3b344b80e9125c943ab12c (patch) | |
| tree | 404d6f5ae8004cda9f435f4d0ecdce3fc7e37a6a | |
| parent | e18f79780a71d716d2499ae0a9132cbf7273a121 (diff) | |
| download | xen-32915112d6c92459de3b344b80e9125c943ab12c.tar.gz xen-32915112d6c92459de3b344b80e9125c943ab12c.tar.bz2 xen-32915112d6c92459de3b344b80e9125c943ab12c.zip | |
bitkeeper revision 1.1627.1.1 (429dccc4mVL3VaR3aEhZK7D4ZhqHfA)
remove assertion that REMOVABLE/CDROM devices have no partition.
Signed-off-by: Vincent Hanquez <vincent@xensource.com>
| -rw-r--r-- | linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c index 303d8ccae4..233aeda16c 100644 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/vbd.c +++ b/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)); |