diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-01-10 01:37:16 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-03-28 20:05:43 +0200 |
| commit | a6137305a8c47fa92ab1a8efcfe76f0e9fa96ab7 (patch) | |
| tree | c56b702f0903af8713bb76017fdfc33f1bc2e2d0 /fs | |
| parent | cifs: no need to wank with copying and advancing iovec on recvmsg side either (diff) | |
| download | linux-a6137305a8c47fa92ab1a8efcfe76f0e9fa96ab7.tar.xz linux-a6137305a8c47fa92ab1a8efcfe76f0e9fa96ab7.zip | |
cifs_readv_receive: use cifs_read_from_socket()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/cifssmb.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 76fcb50295a3..3da077afad1f 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -1447,10 +1447,8 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) len = min_t(unsigned int, buflen, server->vals->read_rsp_size) - HEADER_SIZE(server) + 1; - rdata->iov.iov_base = buf + HEADER_SIZE(server) - 1; - rdata->iov.iov_len = len; - - length = cifs_readv_from_socket(server, &rdata->iov, 1, len); + length = cifs_read_from_socket(server, + buf + HEADER_SIZE(server) - 1, len); if (length < 0) return length; server->total_read += length; @@ -1502,9 +1500,8 @@ cifs_readv_receive(struct TCP_Server_Info *server, struct mid_q_entry *mid) len = data_offset - server->total_read; if (len > 0) { /* read any junk before data into the rest of smallbuf */ - rdata->iov.iov_base = buf + server->total_read; - rdata->iov.iov_len = len; - length = cifs_readv_from_socket(server, &rdata->iov, 1, len); + length = cifs_read_from_socket(server, + buf + server->total_read, len); if (length < 0) return length; server->total_read += length; |