[PATCH] ->major_name inlined

char *major_name replaced with char disk_name[16];  All uses of ->major_name
replaced with those of ->disk_name and (obviously) simplified big way.  Bunch
of arrays, kmallocs, etc. is gone.

10 files changed, 10 insertions, 10 deletions

diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index c92f58be83cc..59148c11e1f7 100644
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -1695,7 +1695,7 @@ static struct gendisk azt_disk = {
 	.first_minor = 0,
 	.minor_shift = 0,
 	.fops = &azt_fops,
-	.major_name = "aztcd"
+	.disk_name = "aztcd"
 };
 
 /*
diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 219efcd492b2..572af9fca926 100644
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -3192,7 +3192,7 @@ static struct gendisk scd_gendisk = {
 	.major		= MAJOR_NR,
 	.first_minor	= 0,
 	.minor_shift	= 0,
-	.major_name	= "cdu31a",
+	.disk_name	= "cdu31a",
 	.fops		= &scd_bdops,
 	.flags		= GENHD_FL_CD,
 };
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index a2c924b970be..c1074b414914 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -1361,7 +1361,7 @@ static struct gendisk cm206_gendisk = {
 	.major		= MAJOR_NR,
 	.first_minor	= 0,
 	.minor_shift	= 0,
-	.major_name	= "cm206",
+	.disk_name	= "cm206",
 	.fops		= &cm206_bdops,
 	.flags		= GENHD_FL_CD,
 };
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index 899cfc22171a..c80cd3ca7735 100644
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -903,7 +903,7 @@ static struct gendisk gscd_disk = {
 	.first_minor = 0,
 	.minor_shift = 0,
 	.fops = &gscd_fops,
-	.major_name = "gscd"
+	.disk_name = "gscd"
 };
 
 static void __exit gscd_exit(void)
diff --git a/drivers/cdrom/mcd.c b/drivers/cdrom/mcd.c
index 1616b67ce761..1b2a958968b0 100644
--- a/drivers/cdrom/mcd.c
+++ b/drivers/cdrom/mcd.c
@@ -225,7 +225,7 @@ static struct gendisk mcd_gendisk = {
 	.major		= MAJOR_NR,
 	.first_minor	= 0,
 	.minor_shift	= 0,
-	.major_name	= "mcd",
+	.disk_name	= "mcd",
 	.fops		= &mcd_bdops,
 	.flags		= GENHD_FL_CD,
 };
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 748bae979b63..85eeb621ba0c 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -1210,7 +1210,7 @@ int __init mcdx_init_drive(int drive)
 	disk->major = MAJOR_NR;
 	disk->first_minor = drive;
 	disk->minor_shift = 0;
-	disk->major_name = stuffp->info.name;
+	strcpy(disk->disk_name, stuffp->info.name);
 	disk->fops = &mcdx_bdops;
 	disk->flags = GENHD_FL_CD;
 
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index 611892ee400c..8b1da1b5b5f9 100644
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -2002,7 +2002,7 @@ static struct gendisk optcd_disk = {
 	.first_minor = 0,
 	.minor_shift = 0,
 	.fops = &opt_fops,
-	.major_name = "optcd"
+	.disk_name = "optcd"
 };
 
 /* Test for presence of drive and initialize it. Called at boot time
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c
index f255d069a752..37c1e773fb04 100644
--- a/drivers/cdrom/sbpcd.c
+++ b/drivers/cdrom/sbpcd.c
@@ -5835,7 +5835,7 @@ int __init sbpcd_init(void)
 		disk->first_minor = j;
 		disk->minor_shift = 0;
 		disk->fops = &sbpcd_bdops;
-		disk->major_name = sbpcd_infop->name;
+		strcpy(disk->disk_name, sbpcd_infop->name);
 		disk->flags = GENHD_FL_CD;
 		sprintf(nbuff, "c0t%d", p->drv_id);
 		disk->de = devfs_mk_dir(devfs_handle, nbuff, NULL);
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index f501d38182f9..edceb3a3dc85 100644
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -1670,7 +1670,7 @@ static struct gendisk sjcd_disk =
 	.first_minor = 0,
 	.minor_shift = 0,
 	.fops = &sjcd_fops,
-	.major_name = "sjcd"
+	.disk_name = "sjcd"
 };
 
 /*
diff --git a/drivers/cdrom/sonycd535.c b/drivers/cdrom/sonycd535.c
index 46fd465d8e35..cd28b4f1b3d2 100644
--- a/drivers/cdrom/sonycd535.c
+++ b/drivers/cdrom/sonycd535.c
@@ -1460,7 +1460,7 @@ static struct gendisk cdu_disk =
 	.first_minor = 0,
 	.minor_shift = 0,
 	.fops = &cdu_fops,
-	.major_name = "cdu",
+	.disk_name = "cdu",
 };
 
 /*