Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / fs / 9p / v9fs.c

diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c
index d37416e..d9b561b 100644 (file)
--- a/fs/9p/v9fs.c
+++ b/fs/9p/v9fs.c
@@ -23,10 +23,10 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/sched.h>
 #include <linux/parser.h>
 #include <linux/idr.h>
 
@@ -457,11 +457,18 @@ static int __init init_v9fs(void)
 
        v9fs_error_init();
 
-       printk(KERN_INFO "Installing v9fs 9P2000 file system support\n");
+       printk(KERN_INFO "Installing v9fs 9p2000 file system support\n");
 
        ret = v9fs_mux_global_init();
-       if (!ret)
-               ret = register_filesystem(&v9fs_fs_type);
+       if (ret) {
+               printk(KERN_WARNING "v9fs: starting mux failed\n");
+               return ret;
+       }
+       ret = register_filesystem(&v9fs_fs_type);
+       if (ret) {
+               printk(KERN_WARNING "v9fs: registering file system failed\n");
+               v9fs_mux_global_exit();
+       }
 
        return ret;
 }