From: Trond Myklebust <trond.myklebust@hammerspace.com>
Date: Fri, 15 Feb 2019 21:53:04 +0000 (-0500)
Subject: SUNRPC: Don't suppress socket errors when a message read completes
X-Git-Tag: v5.1-rc1~48^2~43
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=727fcc64a0f8d346bdd60a7c92e9e720228ce037;p=linux.git

SUNRPC: Don't suppress socket errors when a message read completes

If the message read completes, but the socket returned an error
condition, we should ensure to propagate that error.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
---

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 492cec3f1451..e51716e88899 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -508,13 +508,10 @@ xs_read_stream_request(struct sock_xprt *transport, struct msghdr *msg,
 				&read);
 		transport->recv.offset += read;
 		transport->recv.copied += read;
-	} else
-		read = 0;
+	}
 
-	if (transport->recv.offset == transport->recv.len) {
+	if (transport->recv.offset == transport->recv.len)
 		xs_read_stream_check_eor(transport, msg);
-		return read;
-	}
 
 	if (want == 0)
 		return 0;