[Linux-NTFS-cvs] CVS: dynamic-disk/linux/fs/partitions Config.in,1.3,1.4 Makefile,1.1,1.2 check.c,1.1.1.1,1.2

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions
In directory usw-pr-cvs1:/tmp/cvs-serv22485

Modified Files:
	Config.in Makefile check.c 
Log Message:
external changes from the kernel source tree


Index: Config.in
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/Config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- Config.in	2001/07/03 01:23:28	1.3
+++ Config.in	2001/07/29 13:32:41	1.4
@@ -42,5 +42,5 @@
       define_bool CONFIG_MSDOS_PARTITION y
    fi
-   if [ "$CONFIG_AMIGA" = "y" ]; then
+   if [ "$CONFIG_AMIGA" = "y" -o "CONFIG_AFFS_FS" = "y" ]; then
       define_bool CONFIG_AMIGA_PARTITION y
    fi

Index: Makefile
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -U2 -r1.1 -r1.2
--- Makefile	2001/06/16 22:54:54	1.1
+++ Makefile	2001/07/29 13:32:41	1.2
@@ -17,6 +17,6 @@
 obj-$(CONFIG_AMIGA_PARTITION) += amiga.o
 obj-$(CONFIG_ATARI_PARTITION) += atari.o
-obj-$(CONFIG_LDM_PARTITION) += ldm.o
 obj-$(CONFIG_MAC_PARTITION) += mac.o
+obj-$(CONFIG_LDM_PARTITION) += ldm.o
 obj-$(CONFIG_MSDOS_PARTITION) += msdos.o
 obj-$(CONFIG_OSF_PARTITION) += osf.o

Index: check.c
===================================================================
RCS file: /cvsroot/linux-ntfs/dynamic-disk/linux/fs/partitions/check.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -U2 -r1.1.1.1 -r1.2
--- check.c	2001/06/16 20:29:38	1.1.1.1
+++ check.c	2001/07/29 13:32:41	1.2
@@ -333,4 +333,6 @@
 }
 
+static struct unique_numspace disc_numspace = UNIQUE_NUMBERSPACE_INITIALISER;
+
 static void devfs_register_disc (struct gendisk *dev, int minor)
 {
@@ -340,5 +342,4 @@
 	unsigned int devfs_flags = DEVFS_FL_DEFAULT;
 	char dirname[64], symlink[16];
-	static unsigned int disc_counter;
 	static devfs_handle_t devfs_handle;
 
@@ -361,5 +362,6 @@
 	if (!devfs_handle)
 		devfs_handle = devfs_mk_dir (NULL, "discs", NULL);
-	sprintf (symlink, "disc%u", disc_counter++);
+	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);
@@ -391,4 +393,6 @@
 		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  */
@@ -423,9 +427,8 @@
 
 	dev->part[first_minor].nr_sects = size;
-	/* No Such Agen^Wdevice or no minors to use for partitions */
+	/* No such device or no minors to use for partitions */
 	if (!size || minors == 1)
 		return;
 
-	blk_size[dev->major] = NULL;
 	check_partition(dev, MKDEV(dev->major, first_minor), 1 + first_minor);