fix

diff --git a/ChangeLog b/ChangeLog
index 93681c247705207ed1b2b425aca19ad217422df3..451e369ea571ebb4bbfecfbfd0ff84b344fac2c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-10  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Released 2.2-pre3
+
+2005-01-10  Miklos Szeredi <miklos@szeredi.hu>
+
+       * Add missing code that was accidently left out
+
 2005-01-09  Miklos Szeredi <miklos@szeredi.hu>
 
        * Released 2.2-pre2

diff --git a/configure.in b/configure.in
index 282092491543e58de66b5010684540cf972aff27..84948fd1a8d70ca1866a1554d31864f96addce88 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(fuse, 2.2-pre2)
+AC_INIT(fuse, 2.2-pre3)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(include/config.h)
 

diff --git a/kernel/configure.ac b/kernel/configure.ac
index 14d9593511846e22cb06f5857f77ea9f27655a08..687e45a8db80baf49112e6c45bf234d37648ed8b 100644 (file)
--- a/kernel/configure.ac
+++ b/kernel/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(fuse-kernel, 2.2-pre2)
+AC_INIT(fuse-kernel, 2.2-pre3)
 AC_CONFIG_HEADERS([config.h])
 
 AC_PROG_INSTALL

diff --git a/kernel/inode.c b/kernel/inode.c
index d052f104e2b875a0cf45d9fcc71e5c6ddc10cf3d..ef99a58c88f696562f0da9a7a94ea5ca68803a27 100644 (file)
--- a/kernel/inode.c
+++ b/kernel/inode.c
@@ -13,6 +13,7 @@
 #include <linux/file.h>
 #include <linux/mount.h>
 #include <linux/seq_file.h>
+#include <linux/init.h>
 #include <linux/module.h>
 #ifdef KERNEL_2_6
 #include <linux/moduleparam.h>
@@ -23,6 +24,13 @@
 #include "compat/parser.h"
 #endif
 
+MODULE_AUTHOR("Miklos Szeredi <miklos@szeredi.hu>");
+MODULE_DESCRIPTION("Filesystem in Userspace");
+#ifdef MODULE_LICENSE
+MODULE_LICENSE("GPL");
+#endif
+
+spinlock_t fuse_lock;
 static kmem_cache_t *fuse_inode_cachep;
 static int mount_count;