svn commit: r274658 - in projects/sendfile/sys: kern sys ufs/ufs

[Gleb Smirnoff]

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,