patch-2.4.7 linux/drivers/cdrom/cdrom.c

• Lines: 34
• Date: Wed Jul 11 14:55:41 2001
• Orig file: v2.4.6/linux/drivers/cdrom/cdrom.c
• Orig date: Fri May 4 15:09:23 2001

diff -u --recursive --new-file v2.4.6/linux/drivers/cdrom/cdrom.c linux/drivers/cdrom/cdrom.c
@@ -331,6 +331,7 @@
 #endif /* CONFIG_SYSCTL */ 
 static struct cdrom_device_info *topCdromPtr;
 static devfs_handle_t devfs_handle;
+static struct unique_numspace cdrom_numspace = UNIQUE_NUMBERSPACE_INITIALISER;
 
 struct block_device_operations cdrom_fops =
 {
@@ -354,7 +355,6 @@
         struct cdrom_device_ops *cdo = cdi->ops;
         int *change_capability = (int *)&cdo->capability; /* hack */
 	char vname[16];
-	static unsigned int cdrom_counter;
 
 	cdinfo(CD_OPEN, "entering register_cdrom\n"); 
 
@@ -395,7 +395,8 @@
 
 	if (!devfs_handle)
 		devfs_handle = devfs_mk_dir (NULL, "cdroms", NULL);
-	sprintf (vname, "cdrom%u", cdrom_counter++);
+	cdi->number = devfs_alloc_unique_number (&cdrom_numspace);
+	sprintf (vname, "cdrom%d", cdi->number);
 	if (cdi->de) {
 		int pos;
 		devfs_handle_t slave;
@@ -450,6 +451,7 @@
 		topCdromPtr = cdi->next;
 	cdi->ops->n_minors--;
 	devfs_unregister (cdi->de);
+	devfs_dealloc_unique_number (&cdrom_numspace, cdi->number);
 	cdinfo(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
 	return 0;
 }