Merge branch 'iocb' into for-davem

[deliverable/linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 073809f4125f276799418342f9c60519a3da82e9..989b1ae32afaad0cd2519b83a2c843ac4074528e 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -808,10 +808,10 @@ static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to)
        if (iocb->ki_pos != 0)
                return -ESPIPE;
 
-       if (iocb->ki_nbytes == 0)       /* Match SYS5 behaviour */
+       if (!iov_iter_count(to))        /* Match SYS5 behaviour */
                return 0;
 
-       res = sock_recvmsg(sock, &msg, iocb->ki_nbytes, msg.msg_flags);
+       res = sock_recvmsg(sock, &msg, iov_iter_count(to), msg.msg_flags);
        *to = msg.msg_iter;
        return res;
 }
@@ -833,7 +833,7 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from)
        if (sock->type == SOCK_SEQPACKET)
                msg.msg_flags |= MSG_EOR;
 
-       res = sock_sendmsg(sock, &msg, iocb->ki_nbytes);
+       res = sock_sendmsg(sock, &msg, iov_iter_count(from));
        *from = msg.msg_iter;
        return res;
 }