aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Miklos Szeredi <miklos@szeredi.hu>2005-01-10 09:53:04 +0000
committerGravatar Miklos Szeredi <miklos@szeredi.hu>2005-01-10 09:53:04 +0000
commitc6ee9fd893a781f4cc994d38598b82b03e183908 (patch)
tree422dcb3b7b486b08656c1f793f83962c4302b4cd
parent8d775f79f17fdd596ee1c6b7e185a1063f260640 (diff)
fix
-rw-r--r--ChangeLog8
-rw-r--r--configure.in2
-rw-r--r--kernel/configure.ac2
-rw-r--r--kernel/inode.c8
4 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 93681c2..451e369 100644
--- 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 2820924..84948fd 100644
--- 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 14d9593..687e45a 100644
--- 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 d052f10..ef99a58 100644
--- 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;