From owner-svn-src-projects@freebsd.org Wed Dec 16 21:52:38 2015 Return-Path: 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 35194A49315 for ; Wed, 16 Dec 2015 21:52:38 +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 04C681A00; Wed, 16 Dec 2015 21:52:37 +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 tBGLqbgd089835; Wed, 16 Dec 2015 21:52:37 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBGLqbYM089834; Wed, 16 Dec 2015 21:52:37 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201512162152.tBGLqbYM089834@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 16 Dec 2015 21:52:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292376 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Dec 2015 21:52:38 -0000 Author: glebius Date: Wed Dec 16 21:52:36 2015 New Revision: 292376 URL: https://svnweb.freebsd.org/changeset/base/292376 Log: Adopt new sendfile to new vm_pager_get_pages() KPI. 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 21:33:57 2015 (r292375) +++ projects/sendfile/sys/kern/uipc_syscalls.c Wed Dec 16 21:52:36 2015 (r292376) @@ -2084,13 +2084,14 @@ struct sf_io { }; static void -sf_iodone(void *arg, vm_page_t *pg, int reqpage, int error) +sf_iodone(void *arg, vm_page_t *pg, int count, int error) { struct sf_io *sfio = arg; struct socket *so; if (pg) { - vm_page_xunbusy(pg[reqpage]); + for (int i = 0; i < count; i++) + vm_page_xunbusy(pg[i]); if (error) sfio->error = error; } @@ -2220,7 +2221,7 @@ sendfile_swapin(vm_object_t obj, struct } refcount_acquire(&sfio->nios); - rv = vm_pager_get_pages_async(obj, pa + i, count, 0, + rv = vm_pager_get_pages_async(obj, pa + i, count, NULL, NULL, &sf_iodone, sfio); KASSERT(rv == VM_PAGER_OK, ("%s: pager fail obj %p page %p",