From owner-svn-src-projects@FreeBSD.ORG Wed Sep 10 11:27:53 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 11361DB8; Wed, 10 Sep 2014 11:27:53 +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 F05701D7; Wed, 10 Sep 2014 11:27:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8ABRqYY096406; Wed, 10 Sep 2014 11:27:52 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8ABRqZO096405; Wed, 10 Sep 2014 11:27:52 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201409101127.s8ABRqZO096405@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 10 Sep 2014 11:27:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r271383 - projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 11:27:53 -0000 Author: glebius Date: Wed Sep 10 11:27:52 2014 New Revision: 271383 URL: http://svnweb.freebsd.org/changeset/base/271383 Log: Revert r270963. The plan is that support for asynchronous paging is opt-in, not opt-out. Modified: projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Modified: projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c ============================================================================== --- projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Sep 10 11:27:33 2014 (r271382) +++ projects/sendfile/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c Wed Sep 10 11:27:52 2014 (r271383) @@ -5837,26 +5837,6 @@ zfs_freebsd_getpages(ap) } static int -zfs_freebsd_getpages_async(ap) - struct vop_getpages_async_args /* { - struct vnode *a_vp; - vm_page_t *a_m; - int a_count; - int a_reqpage; - vm_ooffset_t a_offset; - void (*)(void *) a_vop_getpages_iodone; - void *a_arg; - } */ *ap; -{ - int error; - - error = zfs_getpages(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage); - vm_page_xunbusy(ap->a_m[ap->a_reqpage]); - ap->a_vop_getpages_iodone(ap->a_arg); - return (error); -} - -static int zfs_putpages(struct vnode *vp, vm_page_t *ma, size_t len, int flags, int *rtvals) { @@ -7166,7 +7146,6 @@ struct vop_vector zfs_vnodeops = { .vop_setacl = zfs_freebsd_setacl, .vop_aclcheck = zfs_freebsd_aclcheck, .vop_getpages = zfs_freebsd_getpages, - .vop_getpages_async = zfs_freebsd_getpages_async, .vop_putpages = zfs_freebsd_putpages, };