Date: Wed, 16 Dec 2015 21:52:37 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r292376 - projects/sendfile/sys/kern Message-ID: <201512162152.tBGLqbYM089834@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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",
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512162152.tBGLqbYM089834>