PATCH 2.4.5.3: quota initcall

PATCH 2.4.5.3: quota initcall

[Jeff Garzik]

[-- Attachment #1: Type: text/plain, Size: 454 bytes --]

IMHO this is an obvious change, but it is untested...  dquot_hash and
dqstats are correctly declared static and in BSS, and thus are
automatically cleared at kernel startup.

Since quota init now just printk's a startup message, we can safely make
it an initcall.

-- 
Jeff Garzik      | "Do you have to make light of everything?!"
Building 1024    | "I'm extremely serious about nailing your
MandrakeSoft     |  step-daughter, but other than that, yes."

[-- Attachment #2: quota-initcall-2.4.5.3.patch --]
[-- Type: text/plain, Size: 979 bytes --]

Index: linux_2_4/fs/dquot.c
diff -u linux_2_4/fs/dquot.c:1.1.1.50 linux_2_4/fs/dquot.c:1.1.1.50.4.1
--- linux_2_4/fs/dquot.c:1.1.1.50	Tue May 15 04:36:48 2001
+++ linux_2_4/fs/dquot.c	Fri May 18 12:55:25 2001
@@ -1343,13 +1343,11 @@
 }
 
 
-void __init dquot_init_hash(void)
+static int __init dquot_init(void)
 {
 	printk(KERN_NOTICE "VFS: Diskquotas version %s initialized\n", __DQUOT_VERSION__);
-
-	memset(dquot_hash, 0, sizeof(dquot_hash));
-	memset((caddr_t)&dqstats, 0, sizeof(dqstats));
 }
+__initcall(dquot_init);
 
 /*
  * Definitions of diskquota operations.
Index: linux_2_4/init/main.c
diff -u linux_2_4/init/main.c:1.1.1.62 linux_2_4/init/main.c:1.1.1.62.4.1
--- linux_2_4/init/main.c:1.1.1.62	Tue May 15 04:37:56 2001
+++ linux_2_4/init/main.c	Fri May 18 12:55:25 2001
@@ -108,9 +108,6 @@
 #if defined(CONFIG_SYSVIPC)
 extern void ipc_init(void);
 #endif
-#if defined(CONFIG_QUOTA)
-extern void dquot_init_hash(void);
-#endif
 
 /*
  * Boot command-line arguments

PATCH 2.4.5.3 (try 2): quota initcall

[Jeff Garzik]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

Doh!  I should really turn on that quota compile options... <brown ppr
bag>

Much better patch attached.

-- 
Jeff Garzik      | "Do you have to make light of everything?!"
Building 1024    | "I'm extremely serious about nailing your
MandrakeSoft     |  step-daughter, but other than that, yes."

[-- Attachment #2: quota-initcall-2.4.5.3.patch --]
[-- Type: text/plain, Size: 1193 bytes --]

Index: linux_2_4/fs/dquot.c
diff -u linux_2_4/fs/dquot.c:1.1.1.50 linux_2_4/fs/dquot.c:1.1.1.50.4.2
--- linux_2_4/fs/dquot.c:1.1.1.50	Tue May 15 04:36:48 2001
+++ linux_2_4/fs/dquot.c	Fri May 18 13:18:36 2001
@@ -1343,13 +1343,12 @@
 }
 
 
-void __init dquot_init_hash(void)
+static int __init dquot_init(void)
 {
 	printk(KERN_NOTICE "VFS: Diskquotas version %s initialized\n", __DQUOT_VERSION__);
-
-	memset(dquot_hash, 0, sizeof(dquot_hash));
-	memset((caddr_t)&dqstats, 0, sizeof(dqstats));
+	return 0;
 }
+__initcall(dquot_init);
 
 /*
  * Definitions of diskquota operations.
Index: linux_2_4/init/main.c
diff -u linux_2_4/init/main.c:1.1.1.62 linux_2_4/init/main.c:1.1.1.62.4.2
--- linux_2_4/init/main.c:1.1.1.62	Tue May 15 04:37:56 2001
+++ linux_2_4/init/main.c	Fri May 18 13:18:36 2001
@@ -108,9 +108,6 @@
 #if defined(CONFIG_SYSVIPC)
 extern void ipc_init(void);
 #endif
-#if defined(CONFIG_QUOTA)
-extern void dquot_init_hash(void);
-#endif
 
 /*
  * Boot command-line arguments
@@ -579,9 +576,6 @@
 #endif
 #if defined(CONFIG_SYSVIPC)
 	ipc_init();
-#endif
-#if defined(CONFIG_QUOTA)
-	dquot_init_hash();
 #endif
 	check_bugs();
 	printk("POSIX conformance testing by UNIFIX\n");