diff options
author | Sripathi Kodi <sripathik@in.ibm.com> | 2010-03-08 12:33:04 -0500 |
---|---|---|
committer | Eric Van Hensbergen <ericvh@gmail.com> | 2010-03-13 09:57:29 -0500 |
commit | 45bc21edb52fa71dbb1324c6f573aa880e95519d (patch) | |
tree | adee2b59a562679241f874c978162739e1df78bb /net | |
parent | fae4528b2341f2ab0c86c191e24d9cdd93624c60 (diff) |
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: Sripathi Kodi <sripathik@in.ibm.com>
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/9p/client.c | 16 |
1 files changed, 8 insertions, 8 deletions
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)) |