Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...

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

diff --git a/fs/filesystems.c b/fs/filesystems.c
index 276be78..9f10728 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)