From owner-svn-src-projects@FreeBSD.ORG  Sun Sep 14 09:18:35 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 23468DCA;
 Sun, 14 Sep 2014 09:18:35 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 0EB90BA8;
 Sun, 14 Sep 2014 09:18:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8E9IYdB092098;
 Sun, 14 Sep 2014 09:18:34 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8E9IYj6092095;
 Sun, 14 Sep 2014 09:18:34 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201409140918.s8E9IYj6092095@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sun, 14 Sep 2014 09:18:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r271575 - projects/sendfile/sys/kern
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 14 Sep 2014 09:18:35 -0000

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);