From owner-svn-src-projects@FreeBSD.ORG  Wed Nov 19 06:14:55 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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C5F2C3E3;
 Wed, 19 Nov 2014 06:14:55 +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 B2A5CFD;
 Wed, 19 Nov 2014 06:14:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAJ6EtiL023692;
 Wed, 19 Nov 2014 06:14:55 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAJ6EtfV023690;
 Wed, 19 Nov 2014 06:14:55 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201411190614.sAJ6EtfV023690@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: Wed, 19 Nov 2014 06:14:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r274689 - in projects/sendfile/sys: kern vm
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: Wed, 19 Nov 2014 06:14:55 -0000

Author: glebius
Date: Wed Nov 19 06:14:54 2014
New Revision: 274689
URL: https://svnweb.freebsd.org/changeset/base/274689

Log:
  Make the iodone callback responsible on unbusying the reqpage.
  
  Suggested by:	kib
  Sponsored by:	Nginx, Inc.
  Sponsored by:	Netflix

Modified:
  projects/sendfile/sys/kern/uipc_syscalls.c
  projects/sendfile/sys/vm/vnode_pager.c

Modified: projects/sendfile/sys/kern/uipc_syscalls.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_syscalls.c	Wed Nov 19 06:13:55 2014	(r274688)
+++ projects/sendfile/sys/kern/uipc_syscalls.c	Wed Nov 19 06:14:54 2014	(r274689)
@@ -2070,8 +2070,11 @@ sf_iodone(void *arg, vm_page_t *pg, int 
 	struct sf_io *sfio = arg;
 	struct socket *so;
 
-	if (error)
-		sfio->error = error;
+	if (pg) {
+		vm_page_xunbusy(pg[reqpage]);
+		if (error)
+			sfio->error = error;
+	}
 
 	if (!refcount_release(&sfio->nios))
 		return;

Modified: projects/sendfile/sys/vm/vnode_pager.c
==============================================================================
--- projects/sendfile/sys/vm/vnode_pager.c	Wed Nov 19 06:13:55 2014	(r274688)
+++ projects/sendfile/sys/vm/vnode_pager.c	Wed Nov 19 06:14:54 2014	(r274689)
@@ -1061,7 +1061,6 @@ vnode_pager_generic_getpages_done_async(
 	int error;
 
 	error = vnode_pager_generic_getpages_done(d);
-	vm_page_xunbusy(d->m[d->reqpage]);
 	d->iodone(d->arg, d->m, d->reqpage, error);
 	free(d, M_TEMP);
 }