9p: fix error path during early mount

There was some cleanup issues during early mount which would trigger
a kernel bug for certain types of failure.  This patch reorganizes the
cleanup to get rid of the bad behavior.

This also merges the 9pnet and 9pnet_fd modules for the purpose of
configuration and initialization.  Keeping the fd transport separate
from the core 9pnet code seemed like a good idea at the time, but in
practice has caused more harm and confusion than good.

Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/net/9p/mod.c b/net/9p/mod.c
index c6d9695949e..bdee1fb7cc6 100644
--- a/net/9p/mod.c
+++ b/net/9p/mod.c
@@ -107,6 +107,7 @@ static int __init init_p9(void)
 
         p9_error_init();
         printk(KERN_INFO "Installing 9P2000 support\n");
+        p9_trans_fd_init();
 
         return ret;
 }