Merge with 2.3.99-pre1.

1 files changed, 8 insertions, 15 deletions

diff --git a/fs/efs/super.c b/fs/efs/super.c
index 092c2f0a7..7917bef5c 100644
--- a/fs/efs/super.c
+++ b/fs/efs/super.c
@@ -17,26 +17,22 @@ static DECLARE_FSTYPE_DEV(efs_fs_type, "efs", efs_read_super);
 
 static struct super_operations efs_superblock_operations = {
 	read_inode:	efs_read_inode,
-	put_super:	efs_put_super,
 	statfs:		efs_statfs,
 };
 
-int __init init_efs_fs(void) {
-	return register_filesystem(&efs_fs_type);
-}
-
-#ifdef MODULE
-EXPORT_NO_SYMBOLS;
-
-int init_module(void) {
+static int __init init_efs_fs(void) {
 	printk("EFS: "EFS_VERSION" - http://aeschi.ch.eu.org/efs/\n");
-	return init_efs_fs();
+	return register_filesystem(&efs_fs_type);
 }
 
-void cleanup_module(void) {
+static void __exit exit_efs_fs(void) {
 	unregister_filesystem(&efs_fs_type);
 }
-#endif
+
+EXPORT_NO_SYMBOLS;
+
+module_init(init_efs_fs)
+module_exit(exit_efs_fs)
 
 static efs_block_t efs_validate_vh(struct volume_header *vh) {
 	int		i;
@@ -209,9 +205,6 @@ out_no_fs:
 	return(NULL);
 }
 
-void efs_put_super(struct super_block *s) {
-}
-
 int efs_statfs(struct super_block *s, struct statfs *buf) {
 	struct efs_sb_info *sb = SUPER_INFO(s);