Commit 45bc21ed authored by Sripathi Kodi's avatar Sripathi Kodi Committed by Eric Van Hensbergen

9p: Change the name of new protocol from 9p2010.L to 9p2000.L

This patch changes the name of the new 9P protocol from 9p2010.L to
9p2000.u. This is because we learnt that the name 9p2010 is already
being used by others.
Signed-off-by: default avatarSripathi Kodi <sripathik@in.ibm.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent fae4528b
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
/** /**
* enum p9_session_flags - option flags for each 9P session * enum p9_session_flags - option flags for each 9P session
* @V9FS_PROTO_2000U: whether or not to use 9P2000.u extensions * @V9FS_PROTO_2000U: whether or not to use 9P2000.u extensions
* @V9FS_PROTO_2010L: whether or not to use 9P2010.l extensions * @V9FS_PROTO_2000L: whether or not to use 9P2000.l extensions
* @V9FS_ACCESS_SINGLE: only the mounting user can access the hierarchy * @V9FS_ACCESS_SINGLE: only the mounting user can access the hierarchy
* @V9FS_ACCESS_USER: a new attach will be issued for every user (default) * @V9FS_ACCESS_USER: a new attach will be issued for every user (default)
* @V9FS_ACCESS_ANY: use a single attach for all users * @V9FS_ACCESS_ANY: use a single attach for all users
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
*/ */
enum p9_session_flags { enum p9_session_flags {
V9FS_PROTO_2000U = 0x01, V9FS_PROTO_2000U = 0x01,
V9FS_PROTO_2010L = 0x02, V9FS_PROTO_2000L = 0x02,
V9FS_ACCESS_SINGLE = 0x04, V9FS_ACCESS_SINGLE = 0x04,
V9FS_ACCESS_USER = 0x08, V9FS_ACCESS_USER = 0x08,
V9FS_ACCESS_ANY = 0x0C, V9FS_ACCESS_ANY = 0x0C,
...@@ -130,5 +130,5 @@ static inline int v9fs_proto_dotu(struct v9fs_session_info *v9ses) ...@@ -130,5 +130,5 @@ static inline int v9fs_proto_dotu(struct v9fs_session_info *v9ses)
static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses) static inline int v9fs_proto_dotl(struct v9fs_session_info *v9ses)
{ {
return v9ses->flags & V9FS_PROTO_2010L; return v9ses->flags & V9FS_PROTO_2000L;
} }
...@@ -32,13 +32,13 @@ ...@@ -32,13 +32,13 @@
/** enum p9_proto_versions - 9P protocol versions /** enum p9_proto_versions - 9P protocol versions
* @p9_proto_legacy: 9P Legacy mode, pre-9P2000.u * @p9_proto_legacy: 9P Legacy mode, pre-9P2000.u
* @p9_proto_2000u: 9P2000.u extension * @p9_proto_2000u: 9P2000.u extension
* @p9_proto_2010L: 9P2010.L extension * @p9_proto_2000L: 9P2000.L extension
*/ */
enum p9_proto_versions{ enum p9_proto_versions{
p9_proto_legacy = 0, p9_proto_legacy = 0,
p9_proto_2000u = 1, p9_proto_2000u = 1,
p9_proto_2010L = 2, p9_proto_2000L = 2,
}; };
......
...@@ -60,7 +60,7 @@ static const match_table_t tokens = { ...@@ -60,7 +60,7 @@ static const match_table_t tokens = {
inline int p9_is_proto_dotl(struct p9_client *clnt) inline int p9_is_proto_dotl(struct p9_client *clnt)
{ {
return (clnt->proto_version == p9_proto_2010L); return (clnt->proto_version == p9_proto_2000L);
} }
EXPORT_SYMBOL(p9_is_proto_dotl); EXPORT_SYMBOL(p9_is_proto_dotl);
...@@ -80,9 +80,9 @@ static unsigned char get_protocol_version(const substring_t *name) ...@@ -80,9 +80,9 @@ static unsigned char get_protocol_version(const substring_t *name)
} else if (!strncmp("9p2000.u", name->from, name->to-name->from)) { } else if (!strncmp("9p2000.u", name->from, name->to-name->from)) {
version = p9_proto_2000u; version = p9_proto_2000u;
P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2000.u\n"); P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2000.u\n");
} else if (!strncmp("9p2010.L", name->from, name->to-name->from)) { } else if (!strncmp("9p2000.L", name->from, name->to-name->from)) {
version = p9_proto_2010L; version = p9_proto_2000L;
P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2010.L\n"); P9_DPRINTK(P9_DEBUG_9P, "Protocol version: 9P2000.L\n");
} else { } else {
P9_DPRINTK(P9_DEBUG_ERROR, "Unknown protocol version %s. ", P9_DPRINTK(P9_DEBUG_ERROR, "Unknown protocol version %s. ",
name->from); name->from);
...@@ -672,9 +672,9 @@ int p9_client_version(struct p9_client *c) ...@@ -672,9 +672,9 @@ int p9_client_version(struct p9_client *c)
c->msize, c->proto_version); c->msize, c->proto_version);
switch (c->proto_version) { switch (c->proto_version) {
case p9_proto_2010L: case p9_proto_2000L:
req = p9_client_rpc(c, P9_TVERSION, "ds", req = p9_client_rpc(c, P9_TVERSION, "ds",
c->msize, "9P2010.L"); c->msize, "9P2000.L");
break; break;
case p9_proto_2000u: case p9_proto_2000u:
req = p9_client_rpc(c, P9_TVERSION, "ds", req = p9_client_rpc(c, P9_TVERSION, "ds",
...@@ -700,8 +700,8 @@ int p9_client_version(struct p9_client *c) ...@@ -700,8 +700,8 @@ int p9_client_version(struct p9_client *c)
} }
P9_DPRINTK(P9_DEBUG_9P, "<<< RVERSION msize %d %s\n", msize, version); P9_DPRINTK(P9_DEBUG_9P, "<<< RVERSION msize %d %s\n", msize, version);
if (!strncmp(version, "9P2010.L", 8)) if (!strncmp(version, "9P2000.L", 8))
c->proto_version = p9_proto_2010L; c->proto_version = p9_proto_2000L;
else if (!strncmp(version, "9P2000.u", 8)) else if (!strncmp(version, "9P2000.u", 8))
c->proto_version = p9_proto_2000u; c->proto_version = p9_proto_2000u;
else if (!strncmp(version, "9P2000", 6)) else if (!strncmp(version, "9P2000", 6))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment