---

yaml --- r: 157140 b: refs/heads/master c: 0aad37e h: refs/heads/master v: v3
git-mirror · Aug 17, 2009 · 74f5180 · 74f5180
1 parent 8c9c2c5
commit 74f5180
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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;