hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net/9p: switch to copy_from_iter_full() 

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2017-02-17 23:16:09 -05:00
parent 3073f070a1
commit 1c512a7ca9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/9p/client.c
View File

@ -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]; ename = &req->rc->sdata[req->rc->offset];
if (len > inline_len) { if (len > inline_len) {
/* We have error in external buffer */ /* We have error in external buffer */
err = copy_from_iter(ename + inline_len, if (!copy_from_iter_full(ename + inline_len,
len - inline_len, uidata); len - inline_len, uidata)) {
if (err != len - inline_len) {
err = -EFAULT; err = -EFAULT;
goto out_err; goto out_err;
} }

2
net/9p/protocol.c
View File

@ -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); size_t len = min(pdu->capacity - pdu->size, size);
struct iov_iter i = *from; 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; len = 0;
pdu->size += len; pdu->size += len;