Date: Sun, 14 Sep 2014 09:18:34 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r271575 - projects/sendfile/sys/kern Message-ID: <201409140918.s8E9IYj6092095@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Sun Sep 14 09:18:34 2014 New Revision: 271575 URL: http://svnweb.freebsd.org/changeset/base/271575 Log: After-merge fixes. Modified: projects/sendfile/sys/kern/uipc_mbuf.c projects/sendfile/sys/kern/vfs_default.c Modified: projects/sendfile/sys/kern/uipc_mbuf.c ============================================================================== --- projects/sendfile/sys/kern/uipc_mbuf.c Sun Sep 14 09:09:49 2014 (r271574) +++ projects/sendfile/sys/kern/uipc_mbuf.c Sun Sep 14 09:18:34 2014 (r271575) @@ -1001,7 +1001,7 @@ m_catpkt(struct mbuf *m, struct mbuf *n) M_ASSERTPKTHDR(n); m->m_pkthdr.len += n->m_pkthdr.len; - m_demote(n, 1); + m_demote(n, 1, 0); m_cat(m, n); } Modified: projects/sendfile/sys/kern/vfs_default.c ============================================================================== --- projects/sendfile/sys/kern/vfs_default.c Sun Sep 14 09:09:49 2014 (r271574) +++ projects/sendfile/sys/kern/vfs_default.c Sun Sep 14 09:18:34 2014 (r271575) @@ -744,8 +744,7 @@ vop_stdgetpages_async_emulate(struct vop { int error; - error = VOP_GETPAGES(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage, - ap->a_offset); + error = VOP_GETPAGES(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage); vm_page_xunbusy(ap->a_m[ap->a_reqpage]); ap->a_vop_getpages_iodone(ap->a_arg); return (error);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409140918.s8E9IYj6092095>