diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-02-17 23:16:09 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-21 13:57:22 -0400 |
| commit | 1c512a7ca943575a3fbca6d6366d41e5c7c7d539 (patch) | |
| tree | 095cd4782a0ee6a593c840ae6523f84e85ad910a /net/9p | |
| parent | 3073f070a137e140e3faefa87f2446a8deffc07f (diff) | |
| download | linux-1c512a7ca943575a3fbca6d6366d41e5c7c7d539.tar.bz2 | |
net/9p: switch to copy_from_iter_full()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/9p')
| -rw-r--r-- | net/9p/client.c | 5 | ||||
| -rw-r--r-- | net/9p/protocol.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/9p/client.c b/net/9p/client.c index 8e5c6a8d0a37..1218fb3b52da 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -592,9 +592,8 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req, ename = &req->rc->sdata[req->rc->offset]; if (len > inline_len) { /* We have error in external buffer */ - err = copy_from_iter(ename + inline_len, - len - inline_len, uidata); - if (err != len - inline_len) { + if (!copy_from_iter_full(ename + inline_len, + len - inline_len, uidata)) { err = -EFAULT; goto out_err; } diff --git a/net/9p/protocol.c b/net/9p/protocol.c index 16d287565987..16e10680518c 100644 --- a/net/9p/protocol.c +++ b/net/9p/protocol.c @@ -74,7 +74,7 @@ pdu_write_u(struct p9_fcall *pdu, struct iov_iter *from, size_t size) { size_t len = min(pdu->capacity - pdu->size, size); struct iov_iter i = *from; - if (copy_from_iter(&pdu->sdata[pdu->size], len, &i) != len) + if (!copy_from_iter_full(&pdu->sdata[pdu->size], len, &i)) len = 0; pdu->size += len; |