Attachment 312448 Details for Bug 442077 – Patch to expand the printing of devices (scsi and xvd) in blkfront

[patch] Patch to expand the printing of devices (scsi and xvd) in blkfront

linux-2.6.18-expand-scsi-devices.patch (text/plain), 2.35 KB, created by Chris Lalancette on 2008-07-23 09:59:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2008-07-23 09:59:51 UTC

Size: 2.35 KB

patch

obsolete

>diff -urp linux-2.6.18.noarch.orig/drivers/xen/blkfront/vbd.c linux-2.6.18.noarch/drivers/xen/blkfront/vbd.c
>--- linux-2.6.18.noarch.orig/drivers/xen/blkfront/vbd.c	2008-07-14 22:35:42.000000000 +0200
>+++ linux-2.6.18.noarch/drivers/xen/blkfront/vbd.c	2008-07-14 22:41:32.000000000 +0200
>@@ -46,7 +46,7 @@
>  */
> 
> #define NUM_IDE_MAJORS 10
>-#define NUM_SCSI_MAJORS 9
>+#define NUM_SCSI_MAJORS 17
> #define NUM_VBD_MAJORS 1
> 
> static struct xlbd_type_info xlbd_ide_type = {
>@@ -159,8 +159,11 @@ xlbd_get_major_info(int vdevice)
> 	case SCSI_DISK1_MAJOR ... SCSI_DISK7_MAJOR:
> 		index = 11 + major - SCSI_DISK1_MAJOR;
> 		break;
>-	case SCSI_CDROM_MAJOR: index = 18; break;
>-	default: index = 19; break;
>+        case SCSI_DISK8_MAJOR ... SCSI_DISK15_MAJOR:
>+                index = 18 + major - SCSI_DISK8_MAJOR;
>+                break;
>+        case SCSI_CDROM_MAJOR: index = 26; break;
>+        default: index = 27; break;
> 	}
> 
> 	mi = ((major_info[index] != NULL) ? major_info[index] :
>@@ -217,6 +220,7 @@ xlvbd_alloc_gendisk(int minor, blkif_sec
> 	struct xlbd_major_info *mi;
> 	int nr_minors = 1;
> 	int err = -ENODEV;
>+	unsigned int offset;
> 
> 	BUG_ON(info->gd != NULL);
> 	BUG_ON(info->mi != NULL);
>@@ -234,15 +238,33 @@ xlvbd_alloc_gendisk(int minor, blkif_sec
> 	if (gd == NULL)
> 		goto out;
> 
>-	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));
>-	else
>-		sprintf(gd->disk_name, "%s%c%d", mi->type->diskname,
>-			'a' + mi->index * mi->type->disks_per_major +
>-			(minor >> mi->type->partn_shift),
>-			minor & ((1 << mi->type->partn_shift) - 1));
>+	offset =  mi->index * mi->type->disks_per_major +
>+			(minor >> mi->type->partn_shift);
>+	if (nr_minors > 1) {
>+		if (offset < 26) {
>+			sprintf(gd->disk_name, "%s%c",
>+				mi->type->diskname, 'a' + offset);
>+		}
>+		else {
>+			sprintf(gd->disk_name, "%s%c%c",
>+				mi->type->diskname,
>+				'a' + ((offset/26)-1), 'a' + (offset%26) );
>+		}
>+	}
>+	else {
>+		if (offset < 26) {
>+			sprintf(gd->disk_name, "%s%c%d",
>+				mi->type->diskname,
>+				'a' + offset,
>+				minor & ((1 << mi->type->partn_shift) - 1));
>+		}
>+		else {
>+			sprintf(gd->disk_name, "%s%c%c%d",
>+				mi->type->diskname,
>+				'a' + ((offset/26)-1), 'a' + (offset%26),
>+				minor & ((1 << mi->type->partn_shift) - 1));
>+		}
>+	}
> 
> 	gd->major = mi->major;
> 	gd->first_minor = minor;

Actions: View | Diff

Attachments on bug 442077: 312448