[PATCH] (7/25) Removing bogus arrays - ->part[].number

	Each hd_struct used to have int number; in it.  It's used _only_
in disk->part[0] - disk->part[n].number is never assigned/checked for any
positive n.  Moved from hd_struct to gendisk (disk->part[0].number to
disk->number).

fs/partitions/check.c

@@ -300,8 +300,8 @@ static void devfs_register_disc(struct gendisk *dev)
 	}
 	if (!devfs_handle)
 		devfs_handle = devfs_mk_dir(NULL, "discs", NULL);
-	p[0].number = devfs_alloc_unique_number (&disc_numspace);
-	sprintf(symlink, "disc%d", p[0].number);
+	dev->number = devfs_alloc_unique_number (&disc_numspace);
+	sprintf(symlink, "disc%d", dev->number);
 	devfs_mk_symlink (devfs_handle, symlink, DEVFS_FL_DEFAULT,
 			  dirname + pos, &slave, NULL);
 	p[0].de = devfs_register (dir, "disc", devfs_flags,
@@ -333,7 +333,7 @@ void devfs_register_partitions (struct gendisk *dev, int unregister)
 	if (unregister) {
 		devfs_unregister(p[0].de);
 		p[0].de = NULL;
-		devfs_dealloc_unique_number(&disc_numspace, p[0].number);
+		devfs_dealloc_unique_number(&disc_numspace, dev->number);
 	}
 #endif  /*  CONFIG_DEVFS_FS  */
 }

include/linux/genhd.h

@@ -62,7 +62,6 @@ struct hd_struct {
 	unsigned long start_sect;
 	unsigned long nr_sects;
 	devfs_handle_t de;              /* primary (master) devfs entry  */
-	int number;                     /* stupid old code wastes space  */
 	struct device hd_driverfs_dev;  /* support driverfs hiearchy     */
 };
 
@@ -83,6 +82,7 @@ struct gendisk {
 	devfs_handle_t *de_arr;         /* one per physical disc */
 	struct device *driverfs_dev;
 	int flags;
+	int number;			/* devfs crap */
 };
 
 /* drivers/block/genhd.c */