From owner-svn-src-projects@FreeBSD.ORG Tue Nov 18 15:02:13 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53C8E5AD; Tue, 18 Nov 2014 15:02:13 +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 406DF165; Tue, 18 Nov 2014 15:02:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAIF2DpU093885; Tue, 18 Nov 2014 15:02:13 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAIF2CTR093882; Tue, 18 Nov 2014 15:02:12 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411181502.sAIF2CTR093882@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 18 Nov 2014 15:02:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274658 - in projects/sendfile/sys: kern sys ufs/ufs 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: Tue, 18 Nov 2014 15:02:13 -0000 Author: glebius Date: Tue Nov 18 15:02:11 2014 New Revision: 274658 URL: https://svnweb.freebsd.org/changeset/base/274658 Log: - Remove vop_stdgetpages_async() from UFS, since it inherits from FFS. - Remove vop_stdgetpages_async() and renamed vop_stdgetpages_async_emulate() to vop_stdgetpages_async(). Submitted by: kib Modified: projects/sendfile/sys/kern/vfs_default.c projects/sendfile/sys/sys/vnode.h projects/sendfile/sys/ufs/ufs/ufs_vnops.c Modified: projects/sendfile/sys/kern/vfs_default.c ============================================================================== --- projects/sendfile/sys/kern/vfs_default.c Tue Nov 18 14:56:16 2014 (r274657) +++ projects/sendfile/sys/kern/vfs_default.c Tue Nov 18 15:02:11 2014 (r274658) @@ -83,7 +83,7 @@ static int vop_stdset_text(struct vop_se static int vop_stdunset_text(struct vop_unset_text_args *ap); static int vop_stdget_writecount(struct vop_get_writecount_args *ap); static int vop_stdadd_writecount(struct vop_add_writecount_args *ap); -static int vop_stdgetpages_async_emulate(struct vop_getpages_async_args *ap); +static int vop_stdgetpages_async(struct vop_getpages_async_args *ap); /* * This vnode table stores what we want to do if the filesystem doesn't @@ -112,7 +112,7 @@ struct vop_vector default_vnodeops = { .vop_close = VOP_NULL, .vop_fsync = VOP_NULL, .vop_getpages = vop_stdgetpages, - .vop_getpages_async = vop_stdgetpages_async_emulate, + .vop_getpages_async = vop_stdgetpages_async, .vop_getwritemount = vop_stdgetwritemount, .vop_inactive = VOP_NULL, .vop_ioctl = VOP_ENOTTY, @@ -730,17 +730,8 @@ vop_stdgetpages(ap) ap->a_count, ap->a_reqpage, NULL, NULL); } -/* XXX Needs good comment and a manpage (VOP_GETPAGES_ASYNC(9). */ -int -vop_stdgetpages_async(struct vop_getpages_async_args *ap) -{ - - return vnode_pager_generic_getpages(ap->a_vp, ap->a_m, - ap->a_count, ap->a_reqpage, ap->a_vop_getpages_iodone, ap->a_arg); -} - static int -vop_stdgetpages_async_emulate(struct vop_getpages_async_args *ap) +vop_stdgetpages_async(struct vop_getpages_async_args *ap) { int error; Modified: projects/sendfile/sys/sys/vnode.h ============================================================================== --- projects/sendfile/sys/sys/vnode.h Tue Nov 18 14:56:16 2014 (r274657) +++ projects/sendfile/sys/sys/vnode.h Tue Nov 18 15:02:11 2014 (r274658) @@ -730,7 +730,6 @@ int vop_stdbmap(struct vop_bmap_args *); int vop_stdfsync(struct vop_fsync_args *); int vop_stdgetwritemount(struct vop_getwritemount_args *); int vop_stdgetpages(struct vop_getpages_args *); -int vop_stdgetpages_async(struct vop_getpages_async_args *); int vop_stdinactive(struct vop_inactive_args *); int vop_stdislocked(struct vop_islocked_args *); int vop_stdkqfilter(struct vop_kqfilter_args *); Modified: projects/sendfile/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- projects/sendfile/sys/ufs/ufs/ufs_vnops.c Tue Nov 18 14:56:16 2014 (r274657) +++ projects/sendfile/sys/ufs/ufs/ufs_vnops.c Tue Nov 18 15:02:11 2014 (r274658) @@ -2745,7 +2745,6 @@ struct vop_vector ufs_vnodeops = { .vop_close = ufs_close, .vop_create = ufs_create, .vop_getattr = ufs_getattr, - .vop_getpages_async = vop_stdgetpages_async, .vop_inactive = ufs_inactive, .vop_ioctl = ufs_ioctl, .vop_link = ufs_link,