diff options
author | Eric Van Hensbergen <ericvh@ericvh-laptop.(none)> | 2007-10-17 23:31:07 +0400 |
---|---|---|
committer | Eric Van Hensbergen <ericvh@ericvh-desktop.austin.ibm.com> | 2007-10-17 23:31:07 +0400 |
commit | fb0466c3ae7f1c73f70072af8fd27ac166908a2f (patch) | |
tree | 24af82c397d1f155bded80f3fcb49849da28bcc9 /fs | |
parent | 50fd8010673b770f6489c9ee96680c204aefa84a (diff) | |
download | linux-fb0466c3ae7f1c73f70072af8fd27ac166908a2f.tar.xz |
9p: fix bad kconfig cross-dependency
This patch moves transport dynamic registration and matching to the net
module to prevent a bad Kconfig dependency between the net and fs 9p modules.
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/9p/v9fs.c | 47 |
1 files changed, 1 insertions, 46 deletions
diff --git a/fs/9p/v9fs.c b/fs/9p/v9fs.c index 89ee0bace41d..873802de21cd 100644 --- a/fs/9p/v9fs.c +++ b/fs/9p/v9fs.c @@ -37,47 +37,6 @@ #include "v9fs_vfs.h" /* - * Dynamic Transport Registration Routines - * - */ - -static LIST_HEAD(v9fs_trans_list); -static struct p9_trans_module *v9fs_default_trans; - -/** - * v9fs_register_trans - register a new transport with 9p - * @m - structure describing the transport module and entry points - * - */ -void v9fs_register_trans(struct p9_trans_module *m) -{ - list_add_tail(&m->list, &v9fs_trans_list); - if (m->def) - v9fs_default_trans = m; -} -EXPORT_SYMBOL(v9fs_register_trans); - -/** - * v9fs_match_trans - match transport versus registered transports - * @arg: string identifying transport - * - */ -static struct p9_trans_module *v9fs_match_trans(const substring_t *name) -{ - struct list_head *p; - struct p9_trans_module *t = NULL; - - list_for_each(p, &v9fs_trans_list) { - t = list_entry(p, struct p9_trans_module, list); - if (strncmp(t->name, name->from, name->to-name->from) == 0) { - P9_DPRINTK(P9_DEBUG_TRANS, "trans=%s\n", t->name); - break; - } - } - return t; -} - -/* * Option Parsing (code inspired by NFS code) * NOTE: each transport will parse its own options */ @@ -135,7 +94,7 @@ static void v9fs_parse_options(struct v9fs_session_info *v9ses) v9ses->afid = ~0; v9ses->debug = 0; v9ses->cache = 0; - v9ses->trans = v9fs_default_trans; + v9ses->trans = v9fs_default_trans(); if (!options) return; @@ -245,10 +204,6 @@ struct p9_fid *v9fs_session_init(struct v9fs_session_info *v9ses, v9ses->options = kstrdup(data, GFP_KERNEL); v9fs_parse_options(v9ses); - if ((v9ses->trans == NULL) && !list_empty(&v9fs_trans_list)) - v9ses->trans = list_first_entry(&v9fs_trans_list, - struct p9_trans_module, list); - if (v9ses->trans == NULL) { retval = -EPROTONOSUPPORT; P9_DPRINTK(P9_DEBUG_ERROR, |