diff options
| author | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-02-15 22:53:04 +0100 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@hammerspace.com> | 2019-02-20 23:35:58 +0100 |
| commit | 727fcc64a0f8d346bdd60a7c92e9e720228ce037 (patch) | |
| tree | 2a23affd83cf7d7987e1cc3ad21b7137747d7a88 /net/sunrpc | |
| parent | SUNRPC: Handle zero length fragments correctly (diff) | |
| download | linux-727fcc64a0f8d346bdd60a7c92e9e720228ce037.tar.xz linux-727fcc64a0f8d346bdd60a7c92e9e720228ce037.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | net/sunrpc/xprtsock.c | 7 |
1 files changed, 2 insertions, 5 deletions
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; |