summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Bader <stefan.bader@canonical.com>2011-07-14 15:30:37 +0200
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-07-14 14:19:51 -0400
commit89153b5cae9f40c224a5d321665a97bf14220c2c (patch)
tree00290a8a37e49c1dea67be06e2640f26677364c2
parent196cfe2ae8fcdc03b3c7d627e7dfe8c0ce7229f9 (diff)
downloadop-kernel-dev-89153b5cae9f40c224a5d321665a97bf14220c2c.zip
op-kernel-dev-89153b5cae9f40c224a5d321665a97bf14220c2c.tar.gz
xen-blkfront: Fix one off warning about name clash
Avoid telling users to use xvde and onwards when using xvde. Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--drivers/block/xen-blkfront.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 238b941..9ea8c25 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -529,7 +529,7 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,
minor = BLKIF_MINOR_EXT(info->vdevice);
nr_parts = PARTS_PER_EXT_DISK;
offset = minor / nr_parts;
- if (xen_hvm_domain() && offset <= EMULATED_HD_DISK_NAME_OFFSET + 4)
+ if (xen_hvm_domain() && offset < EMULATED_HD_DISK_NAME_OFFSET + 4)
printk(KERN_WARNING "blkfront: vdevice 0x%x might conflict with "
"emulated IDE disks,\n\t choose an xvd device name"
"from xvde on\n", info->vdevice);
OpenPOWER on IntegriCloud