From 74f51809d70e190a06c7e28513d5d8634f7c2946 Mon Sep 17 00:00:00 2001
From: Abhishek Kulkarni <adkulkar@umail.iu.edu>
Date: Mon, 17 Aug 2009 16:38:45 -0500
Subject: [PATCH] --- yaml --- r: 157140 b: refs/heads/master c:
 0aad37ef3deed118d3816e1d1a600eb2ec9dcb87 h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/9p/client.c | 7 +------
 trunk/net/9p/error.c  | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 97776bbed1ba..711a4d801adf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48559b4c30708ebdc849483da9fb83ee08c6c908
+refs/heads/master: 0aad37ef3deed118d3816e1d1a600eb2ec9dcb87
diff --git a/trunk/net/9p/client.c b/trunk/net/9p/client.c
index 7bbd2d5ae8d3..5bf5f227dbe0 100644
--- a/trunk/net/9p/client.c
+++ b/trunk/net/9p/client.c
@@ -411,14 +411,9 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)
 		if (c->dotu)
 			err = -ecode;
 
-		if (!err) {
+		if (!err || !IS_ERR_VALUE(err))
 			err = p9_errstr2errno(ename, strlen(ename));
 
-			/* string match failed */
-			if (!err)
-				err = -ESERVERFAULT;
-		}
-
 		P9_DPRINTK(P9_DEBUG_9P, "<<< RERROR (%d) %s\n", -ecode, ename);
 
 		kfree(ename);
diff --git a/trunk/net/9p/error.c b/trunk/net/9p/error.c
index fdebe4314062..52518512a93e 100644
--- a/trunk/net/9p/error.c
+++ b/trunk/net/9p/error.c
@@ -239,7 +239,7 @@ int p9_errstr2errno(char *errstr, int len)
 		errstr[len] = 0;
 		printk(KERN_ERR "%s: server reported unknown error %s\n",
 			__func__, errstr);
-		errno = 1;
+		errno = ESERVERFAULT;
 	}
 
 	return -errno;