fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / fs / filesystems.c

diff --git a/fs/filesystems.c b/fs/filesystems.c
index 276be78..e3fa77c 100644 (file)
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -6,11 +6,13 @@
  *  table of configured filesystems
  */
 
+#include <linux/syscalls.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/kmod.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/sched.h>       /* for 'current' */
 #include <asm/uaccess.h>
 
 /*
@@ -27,7 +29,7 @@
  */
 
 static struct file_system_type *file_systems;
-static rwlock_t file_systems_lock = RW_LOCK_UNLOCKED;
+static DEFINE_RWLOCK(file_systems_lock);
 
 /* WARNING: This can be used only if we _already_ own a reference */
 void get_filesystem(struct file_system_type *fs)
@@ -67,8 +69,6 @@ int register_filesystem(struct file_system_type * fs)
        int res = 0;
        struct file_system_type ** p;
 
-       if (!fs)
-               return -EINVAL;
        if (fs->next)
                return -EBUSY;
        INIT_LIST_HEAD(&fs->fs_supers);