diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 00:05:58 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 00:05:58 +0200 |
| commit | 9d8190f87b5458160ba75d05e8ad6abefbe48a26 (patch) | |
| tree | 7abeb91aa2a40b91004f53520b7bf1f2c80aab7e /net/9p/mux.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drz... (diff) | |
| parent | 9p: remove sysctl (diff) | |
| download | linux-9d8190f87b5458160ba75d05e8ad6abefbe48a26.tar.xz linux-9d8190f87b5458160ba75d05e8ad6abefbe48a26.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: remove sysctl
9p: fix bad kconfig cross-dependency
9p: soften invalidation in loose_mode
9p: attach-per-user
9p: rename uid and gid parameters
9p: define session flags
9p: Make transports dynamic
Diffstat (limited to 'net/9p/mux.c')
| -rw-r--r-- | net/9p/mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/9p/mux.c b/net/9p/mux.c index 5d70558c4c61..f14014793bed 100644 --- a/net/9p/mux.c +++ b/net/9p/mux.c @@ -31,6 +31,7 @@ #include <linux/idr.h> #include <linux/mutex.h> #include <net/9p/9p.h> +#include <linux/parser.h> #include <net/9p/transport.h> #include <net/9p/conn.h> @@ -71,7 +72,7 @@ struct p9_conn { struct p9_mux_poll_task *poll_task; int msize; unsigned char *extended; - struct p9_transport *trans; + struct p9_trans *trans; struct p9_idpool *tagpool; int err; wait_queue_head_t equeue; @@ -271,7 +272,7 @@ static void p9_mux_poll_stop(struct p9_conn *m) * @msize - maximum message size * @extended - pointer to the extended flag */ -struct p9_conn *p9_conn_create(struct p9_transport *trans, int msize, +struct p9_conn *p9_conn_create(struct p9_trans *trans, int msize, unsigned char *extended) { int i, n; |