From 3bc05b38e6f5e7b403ba6f2f2bd9250582ec5d3d Mon Sep 17 00:00:00 2001 From: Sripathi Kodi Date: Fri, 5 Mar 2010 18:51:04 +0000 Subject: [PATCH] --- yaml --- r: 186123 b: refs/heads/master c: c5a7697da9775f7a0e122fa23180becc311772d1 h: refs/heads/master i: 186121: 9fc5e6619d5421a30d6bc7b084503268d6dfbfa7 186119: 28c2d10fb271347ff09190886f5a55250c68c4f3 v: v3 --- [refs] | 2 +- trunk/net/9p/client.c | 25 ++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d10fb9ec7eba..3669b63f01c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 342fee1d5c7dfa05f4e14ec1e583df4553b09776 +refs/heads/master: c5a7697da9775f7a0e122fa23180becc311772d1 diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c index 9994676e57da..bde9f3d38c57 100644 --- a/trunk/net/9p/client.c +++ b/trunk/net/9p/client.c @@ -670,8 +670,25 @@ int p9_client_version(struct p9_client *c) P9_DPRINTK(P9_DEBUG_9P, ">>> TVERSION msize %d protocol %d\n", c->msize, c->proto_version); - req = p9_client_rpc(c, P9_TVERSION, "ds", c->msize, - p9_is_proto_dotu(c) ? "9P2000.u" : "9P2000"); + + switch (c->proto_version) { + case p9_proto_2010L: + req = p9_client_rpc(c, P9_TVERSION, "ds", + c->msize, "9P2010.L"); + break; + case p9_proto_2000u: + req = p9_client_rpc(c, P9_TVERSION, "ds", + c->msize, "9P2000.u"); + break; + case p9_proto_legacy: + req = p9_client_rpc(c, P9_TVERSION, "ds", + c->msize, "9P2000"); + break; + default: + return -EINVAL; + break; + } + if (IS_ERR(req)) return PTR_ERR(req); @@ -683,7 +700,9 @@ int p9_client_version(struct p9_client *c) } P9_DPRINTK(P9_DEBUG_9P, "<<< RVERSION msize %d %s\n", msize, version); - if (!strncmp(version, "9P2000.u", 8)) + if (!strncmp(version, "9P2010.L", 8)) + c->proto_version = p9_proto_2010L; + else if (!strncmp(version, "9P2000.u", 8)) c->proto_version = p9_proto_2000u; else if (!strncmp(version, "9P2000", 6)) c->proto_version = p9_proto_legacy;