Merge branch 'for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[deliverable/linux.git] / net / 9p / client.c

diff --git a/net/9p/client.c b/net/9p/client.c
index ea79ee9a73489f43a88e57c2eb529fc11d894e5f..3fc94a49ccd53c2dba661acb4d6b0433de9c393b 100644 (file)
--- a/net/9p/client.c
+++ b/net/9p/client.c
@@ -518,10 +518,10 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req)
                if (err)
                        goto out_err;
 
-               if (p9_is_proto_dotu(c))
+               if (p9_is_proto_dotu(c) && ecode < 512)
                        err = -ecode;
 
-               if (!err || !IS_ERR_VALUE(err)) {
+               if (!err) {
                        err = p9_errstr2errno(ename, strlen(ename));
 
                        p9_debug(P9_DEBUG_9P, "<<< RERROR (%d) %s\n",
@@ -605,10 +605,10 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
                if (err)
                        goto out_err;
 
-               if (p9_is_proto_dotu(c))
+               if (p9_is_proto_dotu(c) && ecode < 512)
                        err = -ecode;
 
-               if (!err || !IS_ERR_VALUE(err)) {
+               if (!err) {
                        err = p9_errstr2errno(ename, strlen(ename));
 
                        p9_debug(P9_DEBUG_9P, "<<< RERROR (%d) %s\n",