Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / fs / filesystems.c

diff --git a/fs/filesystems.c b/fs/filesystems.c
index b03f57b1105b34bc5d7438c95f62e2430eb756a1..9135646e41aca06e305743dfe52f572c321d3f27 100644 (file)
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
+#include <linux/fs_parser.h>
 
 /*
  * Handling of filesystem drivers list.
@@ -73,6 +74,9 @@ int register_filesystem(struct file_system_type * fs)
        int res = 0;
        struct file_system_type ** p;
 
+       if (fs->parameters && !fs_validate_description(fs->parameters))
+               return -EINVAL;
+
        BUG_ON(strchr(fs->name, '.'));
        if (fs->next)
                return -EBUSY;