diff mbox

[Natty] Revert Ubuntu specific patch to name virtual Xen block devices sd

Message ID 4D244205.9000106@canonical.com
State Accepted
Delegated to: Andy Whitcroft
Headers show

Commit Message

Stefan Bader Jan. 5, 2011, 10:03 a.m. UTC 
I did a quick test of the patch reverted and had no problems in booting the
instance with the xvd* names.

-Stefan

Comments

John Johansen Jan. 5, 2011, 6:20 p.m. UTC | #1 
On 01/05/2011 02:03 AM, Stefan Bader wrote:
> I did a quick test of the patch reverted and had no problems in booting the
> instance with the xvd* names.
> 
> -Stefan

Acked-by: John Johansen <john.johansen@canonical.com>
diff mbox

Patch

From 74e1569f1b53e038a014742e4b398efddd7e1a9d Mon Sep 17 00:00:00 2001
From: Stefan Bader <stefan.bader@canonical.com>
Date: Wed, 5 Jan 2011 10:02:14 +0100
Subject: [PATCH] Revert "UBUNTU: SAUCE: blkfront: default to sd devices"

This reverts commit 38096c28f13d0c2dd08584ff834da6d81306c7b3. When using
PV on HVM the emulated devices can in some cases stay present and then
lead to a kernel bug because both the real and the virtual driver try
to use the sd* namespace.

Originally this patch was needed because EC2 passed sd* names to the
instance for the root device. Since we now use a label instead of the
block device name we can drop this patch and be more upstream compliant.

BugLink: http://bug.launchpad.net/bugs/684875

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 drivers/block/xen-blkfront.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 8e7a842..5443c18 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -123,7 +123,7 @@  static DEFINE_SPINLOCK(minor_lock);
 #define VDEV_IS_EXTENDED(dev) ((dev)&(EXTENDED))
 #define BLKIF_MINOR_EXT(dev) ((dev)&(~EXTENDED))
 
-#define DEV_NAME	"sd"	/* name in /dev */
+#define DEV_NAME	"xvd"	/* name in /dev */
 
 static int get_id_from_freelist(struct blkfront_info *info)
 {
-- 
1.7.0.4