Date: Wed, 19 Nov 2014 06:14:55 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274689 - in projects/sendfile/sys: kern vm Message-ID: <201411190614.sAJ6EtfV023690@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411190614.sAJ6EtfV023690>