From patchwork Fri Mar 5 16:46:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sripathi Kodi X-Patchwork-Id: 83792 X-Patchwork-Delegate: ericvh@gmail.com Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o25H266Z012119 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 5 Mar 2010 17:02:42 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NnauR-00030o-Dy; Fri, 05 Mar 2010 17:01:55 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.123] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1NnauD-00030M-Jv for v9fs-developer@lists.sourceforge.net; Fri, 05 Mar 2010 17:01:41 +0000 Received-SPF: pass (sfi-mx-3.v28.ch3.sourceforge.com: domain of in.ibm.com designates 122.248.162.7 as permitted sender) client-ip=122.248.162.7; envelope-from=sripathik@in.ibm.com; helo=e28smtp07.in.ibm.com; Received: from e28smtp07.in.ibm.com ([122.248.162.7]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1NnauC-0007GD-78 for v9fs-developer@lists.sourceforge.net; Fri, 05 Mar 2010 17:01:41 +0000 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by e28smtp07.in.ibm.com (8.14.3/8.13.1) with ESMTP id o25GkPHl003552 for ; Fri, 5 Mar 2010 22:16:25 +0530 Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o25GkPIO2486406 for ; Fri, 5 Mar 2010 22:16:25 +0530 Received: from d28av03.in.ibm.com (loopback [127.0.0.1]) by d28av03.in.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o25GkORH021831 for ; Sat, 6 Mar 2010 03:46:24 +1100 Received: from localhost ([9.124.212.45]) by d28av03.in.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o25GkMUM021816 for ; Sat, 6 Mar 2010 03:46:23 +1100 Date: Fri, 5 Mar 2010 22:16:21 +0530 From: Sripathi Kodi To: v9fs-developer@lists.sourceforge.net Message-ID: <20100305221621.72331153@in.ibm.com> In-Reply-To: <20100305220841.4d6b7d6e@in.ibm.com> References: <20100305220841.4d6b7d6e@in.ibm.com> X-Mailer: Claws Mail 3.7.4 (GTK+ 2.18.6; i686-redhat-linux-gnu) Mime-Version: 1.0 X-Spam-Score: -1.1 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record 0.4 AWL AWL: From: address is in the auto white-list X-Headers-End: 1NnauC-0007GD-78 Subject: [V9fs-developer] [PATCH 4/4] [V2] 9P2010.L handshake: .L protocol negotiation X-BeenThere: v9fs-developer@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: v9fs-developer-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 05 Mar 2010 17:02:42 +0000 (UTC) diff --git a/net/9p/client.c b/net/9p/client.c index 586d410..8fb7b78 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -669,8 +669,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); @@ -682,7 +699,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;