cifs_readv_receive: use cifs_read_from_socket()

BugLink: http://bugs.launchpad.net/bugs/1670508
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
(cherry picked from commit a6137305a8c47fa92ab1a8efcfe76f0e9fa96ab7)
Signed-off-by: Joseph Salisbury <joseph.salisbury@canonical.com>

diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c
index 1ee7dc7ff6978cd68b305c3ae7051c230346af50..abf9781d6d8656d70633351a9fda87ca2a3b7cf0 100644 (file)
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
@@ -1450,10 +1450,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;
@@ -1505,9 +1503,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;