From 2e29d8cbddc6850364bcc5c5bdc54106e35f2227 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 5 Apr 2010 14:37:28 -0500 Subject: [PATCH] --- yaml --- r: 189483 b: refs/heads/master c: 3dc9fef67f6292692dba181a6d0fd0211bd0a607 h: refs/heads/master i: 189481: 9e2bdcdccabf7c22aff1fb9b676c117d9f479246 189479: 566f3bb12649d7140b4ea152edafa36e9c4176df v: v3 --- [refs] | 2 +- trunk/net/9p/client.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d387a9466239..bd7704de281f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85a770a8889035625466a4cfb1393cd7d2ffd165 +refs/heads/master: 3dc9fef67f6292692dba181a6d0fd0211bd0a607 diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c index a037a29f3f0e..20a33194d66e 100644 --- a/trunk/net/9p/client.c +++ b/trunk/net/9p/client.c @@ -71,9 +71,10 @@ inline int p9_is_proto_dotu(struct p9_client *clnt) EXPORT_SYMBOL(p9_is_proto_dotu); /* Interpret mount option for protocol version */ -static unsigned char get_protocol_version(const substring_t *name) +static int get_protocol_version(const substring_t *name) { - unsigned char version = -EINVAL; + int version = -EINVAL; + if (!strncmp("9p2000", name->from, name->to-name->from)) { version = p9_proto_legacy; P9_DPRINTK(P9_DEBUG_9P, "Protocol version: Legacy\n");