From owner-svn-src-projects@freebsd.org  Wed Dec 16 22:59:33 2015
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 B7C5CA490C2
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Wed, 16 Dec 2015 22:59:33 +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 846D01BCD;
 Wed, 16 Dec 2015 22:59:33 +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 tBGMxW72007929;
 Wed, 16 Dec 2015 22:59:32 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGMxWik007928;
 Wed, 16 Dec 2015 22:59:32 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201512162259.tBGMxWik007928@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: Wed, 16 Dec 2015 22:59:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r292382 - 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.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Dec 2015 22:59:33 -0000

Author: glebius
Date: Wed Dec 16 22:59:32 2015
New Revision: 292382
URL: https://svnweb.freebsd.org/changeset/base/292382

Log:
  Fix a bug when we request I/O into a valid page.

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

Modified: projects/sendfile/sys/kern/uipc_syscalls.c
==============================================================================
--- projects/sendfile/sys/kern/uipc_syscalls.c	Wed Dec 16 22:48:32 2015	(r292381)
+++ projects/sendfile/sys/kern/uipc_syscalls.c	Wed Dec 16 22:59:32 2015	(r292382)
@@ -2215,6 +2215,8 @@ sendfile_swapin(vm_object_t obj, struct 
 		 * pages for it.  Since readahead is optional, we prefer
 		 * failure over sleep and thus say VM_ALLOC_NOWAIT.
 		 */
+		if (j < npages)
+			a = min(a, j - i - 1);
 		count = min(a + 1, npages + rhpages - i);
 		for (j = npages; j < i + count; j++) {
 			pa[j] = vm_page_grab(obj, OFF_TO_IDX(vmoff(j, off)),