diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 15:05:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 15:05:58 -0700 |
| commit | 9d8190f87b5458160ba75d05e8ad6abefbe48a26 (patch) | |
| tree | 7abeb91aa2a40b91004f53520b7bf1f2c80aab7e /include/net/9p/conn.h | |
| parent | c2f73fd07d2ce4605b404f34395eb734a7ba9967 (diff) | |
| parent | 982c37cfb6e61c0e64634abc2e305d757c1405b2 (diff) | |
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 'include/net/9p/conn.h')
| -rw-r--r-- | include/net/9p/conn.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/9p/conn.h b/include/net/9p/conn.h index 583b6a2cb3d..756d8784f95 100644 --- a/include/net/9p/conn.h +++ b/include/net/9p/conn.h @@ -42,8 +42,8 @@ struct p9_req; */ typedef void (*p9_conn_req_callback)(struct p9_req *req, void *a); -struct p9_conn *p9_conn_create(struct p9_transport *trans, int msize, - unsigned char *dotu); +struct p9_conn *p9_conn_create(struct p9_trans *trans, int msize, + unsigned char *dotu); void p9_conn_destroy(struct p9_conn *); int p9_conn_rpc(struct p9_conn *m, struct p9_fcall *tc, struct p9_fcall **rc); |