diff options
author | Eric Van Hensbergen <ericvh@opteron.9grid.us> | 2008-05-08 20:26:37 -0500 |
---|---|---|
committer | Eric Van Hensbergen <ericvh@opteron.9grid.us> | 2008-05-14 19:23:27 -0500 |
commit | 887b3ece65be7b643dfdae0d433c91a26a3f437d (patch) | |
tree | 471889dcdd3f7eb6762d863fef236014c63a0301 /include/net/9p | |
parent | 332c421e67045343de74e644cdf389f559f0d83f (diff) | |
download | linux-3.10-887b3ece65be7b643dfdae0d433c91a26a3f437d.tar.gz linux-3.10-887b3ece65be7b643dfdae0d433c91a26a3f437d.tar.bz2 linux-3.10-887b3ece65be7b643dfdae0d433c91a26a3f437d.zip |
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>
Diffstat (limited to 'include/net/9p')
-rw-r--r-- | include/net/9p/9p.h | 1 | ||||
-rw-r--r-- | include/net/9p/transport.h | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h index 7bfb2f2e423..b3d3e27c629 100644 --- a/include/net/9p/9p.h +++ b/include/net/9p/9p.h @@ -595,4 +595,5 @@ int p9_idpool_check(int id, struct p9_idpool *p); int p9_error_init(void); int p9_errstr2errno(char *, int); +int p9_trans_fd_init(void); #endif /* NET_9P_H */ diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h index 240e0de888c..0db3a4038dc 100644 --- a/include/net/9p/transport.h +++ b/include/net/9p/transport.h @@ -96,5 +96,4 @@ struct p9_trans_module { void v9fs_register_trans(struct p9_trans_module *m); struct p9_trans_module *v9fs_match_trans(const substring_t *name); struct p9_trans_module *v9fs_default_trans(void); - #endif /* NET_9P_TRANSPORT_H */ |