diff options
| author | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-06-01 15:30:48 +0000 |
|---|---|---|
| committer | vh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk> | 2005-06-01 15:30:48 +0000 |
| commit | b93343ffbd62442083ff87d740551c3518314123 (patch) | |
| tree | ca81b740a0e088393160342ee69bb8ad7b906f1b | |
| parent | 04cb9d77078041e14fb2f493331da14c0f173096 (diff) | |
| parent | 721be74b892e0565fa9030e0f4e271be95ad7af4 (diff) | |
| download | xen-b93343ffbd62442083ff87d740551c3518314123.tar.gz xen-b93343ffbd62442083ff87d740551c3518314123.tar.bz2 xen-b93343ffbd62442083ff87d740551c3518314123.zip | |
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
| -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 9a33656469..e2faa59999 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 @@ -278,15 +278,14 @@ struct gendisk *xlvbd_alloc_gendisk( 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)); |