diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 17:04:13 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 17:04:13 -0500 |
| commit | 48ffd0d5e7b2fb6e7d47344320dbeeaf15d6fd5a (patch) | |
| tree | 835283be489a3ea03d0f10ca8dbb00ad55a3cd20 /net/9p/client.c | |
| parent | aa3ff8e7ce15d756e49141d9aa3f1d9151cda1ca (diff) | |
| parent | d9e292d3ea94ab21f028108527a908e415e856ef (diff) | |
Merge tag 'lsk-v4.1-15.08-rt' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1-rtlinux-lng-preempt-rt-4.1.5-2015.09
LSK RT 15.08 v4.1
Diffstat (limited to 'net/9p/client.c')
| -rw-r--r-- | net/9p/client.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 6f4c4c88db84..81925b923318 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -843,7 +843,8 @@ static struct p9_req_t *p9_client_zc_rpc(struct p9_client *c, int8_t type, if (err < 0) { if (err == -EIO) c->status = Disconnected; - goto reterr; + if (err != -ERESTARTSYS) + goto reterr; } if (req->status == REQ_STATUS_ERROR) { p9_debug(P9_DEBUG_ERROR, "req_status error %d\n", req->t_err); @@ -1647,6 +1648,7 @@ p9_client_write(struct p9_fid *fid, u64 offset, struct iov_iter *from, int *err) if (*err) { trace_9p_protocol_dump(clnt, req->rc); p9_free_req(clnt, req); + break; } p9_debug(P9_DEBUG_9P, "<<< RWRITE count %d\n", count); |