patch-2.3.29 linux/drivers/block/rd.c

• Lines: 77
• Date: Tue Nov 23 10:10:38 1999
• Orig file: v2.3.28/linux/drivers/block/rd.c
• Orig date: Wed Oct 27 16:34:12 1999

diff -u --recursive --new-file v2.3.28/linux/drivers/block/rd.c linux/drivers/block/rd.c
@@ -276,9 +276,11 @@
 
 static int initrd_release(struct inode *inode,struct file *file)
 {
+	extern void free_initrd_mem(unsigned long, unsigned long);
+
+	if (--initrd_users) return 0;
+	free_initrd_mem(initrd_start, initrd_end);
 	initrd_start = 0;
-	/* No need to actually release the pages, because that is
-	   done later by free_all_bootmem. */
 	return 0;
 }
 
@@ -339,8 +341,20 @@
 	block_fsync	/* fsync */ 
 };
 
+/* Before freeing the module, invalidate all of the protected buffers! */
+static void __exit rd_cleanup (void)
+{
+	int i;
+
+	for (i = 0 ; i < NUM_RAMDISKS; i++)
+		invalidate_buffers(MKDEV(MAJOR_NR, i));
+
+	unregister_blkdev( MAJOR_NR, "ramdisk" );
+	blk_dev[MAJOR_NR].request_fn = 0;
+}
+
 /* This is the registration and initialization section of the RAM disk driver */
-int __init rd_init(void)
+int __init rd_init (void)
 {
 	int		i;
 
@@ -378,36 +392,16 @@
 	return 0;
 }
 
-/* loadable module support */
-
 #ifdef MODULE
+module_init(rd_init);
+#endif
+module_exit(rd_cleanup);
 
+/* loadable module support */
 MODULE_PARM     (rd_size, "1i");
 MODULE_PARM_DESC(rd_size, "Size of each RAM disk in kbytes.");
 MODULE_PARM     (rd_blocksize, "i");
 MODULE_PARM_DESC(rd_blocksize, "Blocksize of each RAM disk in bytes.");
-
-int init_module(void)
-{
-	int error = rd_init();
-	if (!error)
-		printk(KERN_INFO "RAMDISK: Loaded as module.\n");
-	return error;
-}
-
-/* Before freeing the module, invalidate all of the protected buffers! */
-void cleanup_module(void)
-{
-	int i;
-
-	for (i = 0 ; i < NUM_RAMDISKS; i++)
-		invalidate_buffers(MKDEV(MAJOR_NR, i));
-
-	unregister_blkdev( MAJOR_NR, "ramdisk" );
-	blk_dev[MAJOR_NR].request_fn = 0;
-}
-
-#endif  /* MODULE */
 
 /* End of non-loading portions of the RAM disk driver */