patch-2.1.37 linux/fs/autofs/init.c

Next file: linux/fs/autofs/inode.c
Previous file: linux/fs/autofs/dirhash.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.36/linux/fs/autofs/init.c linux/fs/autofs/init.c
@@ -10,24 +10,20 @@
  *
  * ------------------------------------------------------------------------- */
 
+#include <linux/init.h>
 #include <linux/module.h>
-#include <linux/auto_fs.h>
+#include "autofs_i.h"
 
-struct file_system_type autofs_fs_type = {
+static struct file_system_type autofs_fs_type = {
 	autofs_read_super, "autofs", 0, NULL
 };
 
-int init_autofs_fs(void)
-{
-	return register_filesystem(&autofs_fs_type);
-}
-
 #ifdef MODULE
 int init_module(void)
 {
 	int status;
 	
-	if ((status = init_autofs_fs()) == 0)
+	if ((status = register_filesystem(&autofs_fs_type)) == 0)
 		register_symtab(0);
 	return status;
 }
@@ -36,7 +32,15 @@
 {
 	unregister_filesystem(&autofs_fs_type);
 }
-#endif
+
+#else /* MODULE */
+
+__initfunc(int init_autofs_fs(void))
+{
+	return register_filesystem(&autofs_fs_type);
+}
+
+#endif /* !MODULE */
 
 #ifdef DEBUG
 void autofs_say(const char *name, int len)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov