From owner-svn-src-head@freebsd.org Tue Mar 7 19:00:52 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5F9ABD00D2A;
Tue, 7 Mar 2017 19:00:52 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 2C9311D2E;
Tue, 7 Mar 2017 19:00:52 +0000 (UTC)
(envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v27J0pOx005585;
Tue, 7 Mar 2017 19:00:51 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id v27J0pPH005582;
Tue, 7 Mar 2017 19:00:51 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201703071900.v27J0pPH005582@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 7 Mar 2017 19:00:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r314876 - in head/sys: kern sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
<svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Mar 2017 19:00:52 -0000
Author: glebius
Date: Tue Mar 7 19:00:50 2017
New Revision: 314876
URL: https://svnweb.freebsd.org/changeset/base/314876
Log:
m_mbuftouio() doesn't modify the mbuf.
Modified:
head/sys/kern/uipc_mbuf.c
head/sys/sys/mbuf.h
Modified: head/sys/kern/uipc_mbuf.c
==============================================================================
--- head/sys/kern/uipc_mbuf.c Tue Mar 7 19:00:27 2017 (r314875)
+++ head/sys/kern/uipc_mbuf.c Tue Mar 7 19:00:50 2017 (r314876)
@@ -1561,7 +1561,7 @@ m_uiotombuf(struct uio *uio, int how, in
* Copy an mbuf chain into a uio limited by len if set.
*/
int
-m_mbuftouio(struct uio *uio, struct mbuf *m, int len)
+m_mbuftouio(struct uio *uio, const struct mbuf *m, int len)
{
int error, length, total;
int progress = 0;
Modified: head/sys/sys/mbuf.h
==============================================================================
--- head/sys/sys/mbuf.h Tue Mar 7 19:00:27 2017 (r314875)
+++ head/sys/sys/mbuf.h Tue Mar 7 19:00:50 2017 (r314876)
@@ -614,7 +614,7 @@ struct mbuf *m_getjcl(int, short, int, i
struct mbuf *m_getm2(struct mbuf *, int, int, short, int);
struct mbuf *m_getptr(struct mbuf *, int, int *);
u_int m_length(struct mbuf *, struct mbuf **);
-int m_mbuftouio(struct uio *, struct mbuf *, int);
+int m_mbuftouio(struct uio *, const struct mbuf *, int);
void m_move_pkthdr(struct mbuf *, struct mbuf *);
int m_pkthdr_init(struct mbuf *, int);
struct mbuf *m_prepend(struct mbuf *, int, int);