From b71e70e5a8c35775e424982e4da9b0df4cb722d7 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 22 Aug 2011 12:18:37 -0700 Subject: [PATCH] 3.0 patches --- queue-3.0/series | 2 + ...e-and-minor-adjustments-for-emulated.patch | 39 +++++++++++++++++++ ...fix-one-off-warning-about-name-clash.patch | 31 +++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 queue-3.0/xen-blkfront-drop-name-and-minor-adjustments-for-emulated.patch create mode 100644 queue-3.0/xen-blkfront-fix-one-off-warning-about-name-clash.patch diff --git a/queue-3.0/series b/queue-3.0/series index b7b83768009..edd74fc08fb 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -19,3 +19,5 @@ ext4-fix-ext4_should_writeback_data-for-no-journal-mode.patch ext4-call-ext4_ioend_wait-and-ext4_flush_completed_io-in.patch ext4-resolve-the-hang-of-direct-i-o-read-in-handling-ext4_io_end_unwritten.patch ext4-fix-nomblk_io_submit-option-so-it-correctly-converts-uninit-blocks.patch +xen-blkfront-drop-name-and-minor-adjustments-for-emulated.patch +xen-blkfront-fix-one-off-warning-about-name-clash.patch diff --git a/queue-3.0/xen-blkfront-drop-name-and-minor-adjustments-for-emulated.patch b/queue-3.0/xen-blkfront-drop-name-and-minor-adjustments-for-emulated.patch new file mode 100644 index 00000000000..6730a4faa3a --- /dev/null +++ b/queue-3.0/xen-blkfront-drop-name-and-minor-adjustments-for-emulated.patch @@ -0,0 +1,39 @@ +From 196cfe2ae8fcdc03b3c7d627e7dfe8c0ce7229f9 Mon Sep 17 00:00:00 2001 +From: Stefan Bader +Date: Thu, 14 Jul 2011 15:30:22 +0200 +Subject: xen-blkfront: Drop name and minor adjustments for emulated + scsi devices + +From: Stefan Bader + +commit 196cfe2ae8fcdc03b3c7d627e7dfe8c0ce7229f9 upstream. + +These were intended to avoid the namespace clash when representing +emulated IDE and SCSI devices. However that seems to confuse users +more than expected (a disk defined as sda becomes xvde). +So for now go back to the scheme which does no adjustments. This +will break when mixing IDE and SCSI names in the configuration of +guests but should be by now expected. + +Acked-by: Stefano Stabellini +Signed-off-by: Stefan Bader +Signed-off-by: Konrad Rzeszutek Wilk +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/block/xen-blkfront.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/block/xen-blkfront.c ++++ b/drivers/block/xen-blkfront.c +@@ -123,8 +123,8 @@ static DEFINE_SPINLOCK(minor_lock); + #define BLKIF_MINOR_EXT(dev) ((dev)&(~EXTENDED)) + #define EMULATED_HD_DISK_MINOR_OFFSET (0) + #define EMULATED_HD_DISK_NAME_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET / 256) +-#define EMULATED_SD_DISK_MINOR_OFFSET (EMULATED_HD_DISK_MINOR_OFFSET + (4 * 16)) +-#define EMULATED_SD_DISK_NAME_OFFSET (EMULATED_HD_DISK_NAME_OFFSET + 4) ++#define EMULATED_SD_DISK_MINOR_OFFSET (0) ++#define EMULATED_SD_DISK_NAME_OFFSET (EMULATED_SD_DISK_MINOR_OFFSET / 256) + + #define DEV_NAME "xvd" /* name in /dev */ + diff --git a/queue-3.0/xen-blkfront-fix-one-off-warning-about-name-clash.patch b/queue-3.0/xen-blkfront-fix-one-off-warning-about-name-clash.patch new file mode 100644 index 00000000000..e58b654e86d --- /dev/null +++ b/queue-3.0/xen-blkfront-fix-one-off-warning-about-name-clash.patch @@ -0,0 +1,31 @@ +From 89153b5cae9f40c224a5d321665a97bf14220c2c Mon Sep 17 00:00:00 2001 +From: Stefan Bader +Date: Thu, 14 Jul 2011 15:30:37 +0200 +Subject: xen-blkfront: Fix one off warning about name clash + +From: Stefan Bader + +commit 89153b5cae9f40c224a5d321665a97bf14220c2c upstream. + +Avoid telling users to use xvde and onwards when using xvde. + +Acked-by: Stefano Stabellini +Signed-off-by: Stefan Bader +Signed-off-by: Konrad Rzeszutek Wilk +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/block/xen-blkfront.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/block/xen-blkfront.c ++++ b/drivers/block/xen-blkfront.c +@@ -529,7 +529,7 @@ static int xlvbd_alloc_gendisk(blkif_sec + 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); -- 2.47.3