diff options
-rw-r--r-- | fs/9p/v9fs.h | 6 | ||||
-rw-r--r-- | include/net/9p/client.h | 4 | ||||
-rw-r--r-- | net/9p/client.c | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/fs/9p/v9fs.h b/fs/9p/v9fs.h index 79000bf62491..6b801d1ddf4b 100644 --- a/fs/9p/v9fs.h +++ b/fs/9p/v9fs.h | |||
@@ -24,7 +24,7 @@ | |||
24 | /** | 24 | /** |
25 | * enum p9_session_flags - option flags for each 9P session | 25 | * enum p9_session_flags - option flags for each 9P session |
26 | * @V9FS_PROTO_2000U: whether or not to use 9P2000.u extensions | 26 | * @V9FS_PROTO_2000U: whether or not to use 9P2000.u extensions |
27 | * @V9FS_PROTO_2010L: whether or not to use 9P2010.l extensions | 27 | * @V9FS_PROTO_2000L: whether or not to use 9P2000.l extensions |
28 | * @V9FS_ACCESS_SINGLE: only the mounting user can access the hierarchy | 28 | * @V9FS_ACCESS_SINGLE: only the mounting user can access the hierarchy |
29 | * @V9FS_ACCESS_USER: a new attach will be issued for every user (default) | 29 | * @V9FS_ACCESS_USER: a new attach will be issued for every user (default) |
30 | * @V9FS_ACCESS_ANY: use a single attach for all users | 30 | * @V9FS_ACCESS_ANY: use a single attach for all users |
@@ -34,7 +34,7 @@ | |||
34 | */ | 34 | */ |
35 | enum p9_session_flags { | 35 | enum p9_session_flags { |
36 | V9FS_PROTO_2000U = 0x01, | 36 | V9FS_PROTO_2000U = 0x01, |
37 | V9FS_PROTO_2010L = 0x02, | 37 | V9FS_PROTO_2000L = 0x02, |
38 | V9FS_ACCESS_SINGLE = 0x04, | 38 | V9FS_ACCESS_SINGLE = 0x04, |
39 | V9FS_ACCESS_USER = 0x08, | 39 | V9FS_ACCESS_USER = 0x08, |
40 | V9FS_ACCESS_ANY = 0x0C, | 40 | V9FS_ACCESS_ANY = 0x0C, |
@@ -130,5 +130,5 @@ static inline int v9fs_proto_dotu(struct v9fs_session_info *v9ses) | |||
130 | 130 | ||
131 | static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses) | 131 | static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses) |
132 | { | 132 | { |
133 | return v9ses->flags & V9FS_PROTO_2010L; | 133 | return v9ses->flags & V9FS_PROTO_2000L; |
134 | } | 134 | } |
diff --git a/include/net/9p/client.h b/include/net/9p/client.h index 52e1fff709e4..f076dfa75ae8 100644 --- a/include/net/9p/client.h +++ b/include/net/9p/client.h | |||
@@ -32,13 +32,13 @@ | |||
32 | /** enum p9_proto_versions - 9P protocol versions | 32 | /** enum p9_proto_versions - 9P protocol versions |
33 | * @p9_proto_legacy: 9P Legacy mode, pre-9P2000.u | 33 | * @p9_proto_legacy: 9P Legacy mode, pre-9P2000.u |
34 | * @p9_proto_2000u: 9P2000.u extension | 34 | * @p9_proto_2000u: 9P2000.u extension |
35 | * @p9_proto_2010L: 9P2010.L extension | 35 | * @p9_proto_2000L: 9P2000.L extension |
36 | */ | 36 | */ |
37 | 37 | ||
38 | enum p9_proto_versions{ | 38 | enum p9_proto_versions{ |
39 | p9_proto_legacy = 0, | 39 | p9_proto_legacy = 0, |
40 | p9_proto_2000u = 1, | 40 | p9_proto_2000u = 1, |
41 | p9_proto_2010L = 2, | 41 | p9_proto_2000L = 2, |
42 | }; | 42 | }; |
43 | 43 | ||
44 | 44 | ||
diff --git a/net/9p/client.c b/net/9p/client.c index bde9f3d38c57..e3e5bf4469ce 100644 --- a/net/9p/client.c +++ b/net/9p/client.c | |||
@@ -60,7 +60,7 @@ static const match_table_t tokens = { | |||
60 | 60 | ||
61 | inline int p9_is_proto_dotl(struct p9_client *clnt) | 61 | inline int p9_is_proto_dotl(struct p9_client *clnt) |
62 | { | 62 | { |
63 | return (clnt->proto_version == p9_proto_2010L); | 63 | return (clnt->proto_version == p9_proto_2000L); |
64 | } | 64 | } |
65 | EXPORT_SYMBOL(p9_is_proto_dotl); | 65 | EXPORT_SYMBOL(p9_is_proto_dotl); |
66 | 66 | ||
@@ -80,9 +80,9 @@ static unsigned char get_protocol_version(const substring_t *name) | |||
80 | } else if (!strncmp("9p2000.u", name->from, name->to-name->from)) { | 80 | } else if (!strncmp("9p2000.u", name->from, name->to-name->from)) { |
81 | version = p9_proto_2000u; | 81 | version = p9_proto_2000u; |
82 | P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2000.u\n"); | 82 | P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2000.u\n"); |
83 | } else if (!strncmp("9p2010.L", name->from, name->to-name->from)) { | 83 | } else if (!strncmp("9p2000.L", name->from, name->to-name->from)) { |
84 | version = p9_proto_2010L; | 84 | version = p9_proto_2000L; |
85 | P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2010.L\n"); | 85 | P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2000.L\n"); |
86 | } else { | 86 | } else { |
87 | P9_DPRINTK(P9_DEBUG_ERROR, "Unknown protocol version %s. ", | 87 | P9_DPRINTK(P9_DEBUG_ERROR, "Unknown protocol version %s. ", |
88 | name->from); | 88 | name->from); |
@@ -672,9 +672,9 @@ int p9_client_version(struct p9_client *c) | |||
672 | c->msize, c->proto_version); | 672 | c->msize, c->proto_version); |
673 | 673 | ||
674 | switch (c->proto_version) { | 674 | switch (c->proto_version) { |
675 | case p9_proto_2010L: | 675 | case p9_proto_2000L: |
676 | req = p9_client_rpc(c, P9_TVERSION, "ds", | 676 | req = p9_client_rpc(c, P9_TVERSION, "ds", |
677 | c->msize, "9P2010.L"); | 677 | c->msize, "9P2000.L"); |
678 | break; | 678 | break; |
679 | case p9_proto_2000u: | 679 | case p9_proto_2000u: |
680 | req = p9_client_rpc(c, P9_TVERSION, "ds", | 680 | req = p9_client_rpc(c, P9_TVERSION, "ds", |
@@ -700,8 +700,8 @@ int p9_client_version(struct p9_client *c) | |||
700 | } | 700 | } |
701 | 701 | ||
702 | P9_DPRINTK(P9_DEBUG_9P, "<<< RVERSION msize %d %s\n", msize, version); | 702 | P9_DPRINTK(P9_DEBUG_9P, "<<< RVERSION msize %d %s\n", msize, version); |
703 | if (!strncmp(version, "9P2010.L", 8)) | 703 | if (!strncmp(version, "9P2000.L", 8)) |
704 | c->proto_version = p9_proto_2010L; | 704 | c->proto_version = p9_proto_2000L; |
705 | else if (!strncmp(version, "9P2000.u", 8)) | 705 | else if (!strncmp(version, "9P2000.u", 8)) |
706 | c->proto_version = p9_proto_2000u; | 706 | c->proto_version = p9_proto_2000u; |
707 | else if (!strncmp(version, "9P2000", 6)) | 707 | else if (!strncmp(version, "9P2000", 6)) |