Update of /cvsroot/linux-mips/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv13548/fs/partitions
Modified Files:
check.c
Log Message:
Sync to 2.4.7
Index: check.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/fs/partitions/check.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** check.c 2001/08/10 18:53:20 1.4
--- check.c 2001/08/25 02:19:28 1.5
***************
*** 329,332 ****
--- 329,334 ----
}
+ static struct unique_numspace disc_numspace = UNIQUE_NUMBERSPACE_INITIALISER;
+
static void devfs_register_disc (struct gendisk *dev, int minor)
{
***************
*** 336,340 ****
unsigned int devfs_flags = DEVFS_FL_DEFAULT;
char dirname[64], symlink[16];
- static unsigned int disc_counter;
static devfs_handle_t devfs_handle;
--- 338,341 ----
***************
*** 357,361 ****
if (!devfs_handle)
devfs_handle = devfs_mk_dir (NULL, "discs", NULL);
! sprintf (symlink, "disc%u", disc_counter++);
devfs_mk_symlink (devfs_handle, symlink, DEVFS_FL_DEFAULT,
dirname + pos, &slave, NULL);
--- 358,363 ----
if (!devfs_handle)
devfs_handle = devfs_mk_dir (NULL, "discs", NULL);
! dev->part[minor].number = devfs_alloc_unique_number (&disc_numspace);
! sprintf (symlink, "disc%d", dev->part[minor].number);
devfs_mk_symlink (devfs_handle, symlink, DEVFS_FL_DEFAULT,
dirname + pos, &slave, NULL);
***************
*** 387,390 ****
--- 389,394 ----
devfs_unregister (dev->part[minor].de);
dev->part[minor].de = NULL;
+ devfs_dealloc_unique_number (&disc_numspace,
+ dev->part[minor].number);
}
#endif /* CONFIG_DEVFS_FS */
|
