Update to FreeBSD head 2017-08-01

Git mirror commit f5002f5e5f78cae9f0269d812dc0aedb0339312c.

Update #3472.
This commit is contained in:
Sebastian Huber
2018-08-07 14:56:50 +02:00
parent de261e0404
commit c37f9fba70
169 changed files with 6857 additions and 3262 deletions

View File

@@ -1519,7 +1519,7 @@ m_uiotombuf(struct uio *uio, int how, int len, int align, int flags)
* the total data supplied by the uio.
*/
if (len > 0)
total = min(uio->uio_resid, len);
total = (uio->uio_resid < len) ? uio->uio_resid : len;
else
total = uio->uio_resid;