svn commit: r271387 - in head/sys: cddl/contrib/opensolaris/uts/common/fs/zfs fs/fuse fs/smbfs kern vm

[Gleb Smirnoff]

Author: glebius
Date: Wed Sep 10 12:36:41 2014
New Revision: 271387
URL: http://svnweb.freebsd.org/changeset/base/271387

Log:
  Remove unused arguments for VOP_GETPAGES(), VOP_PUTPAGES().

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  head/sys/fs/fuse/fuse_vnops.c
  head/sys/fs/smbfs/smbfs_io.c
  head/sys/kern/vfs_default.c
  head/sys/kern/vnode_if.src
  head/sys/vm/vnode_pager.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Wed Sep 10 12:35:42 2014	(r271386)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Wed Sep 10 12:36:41 2014	(r271387)
@@ -5829,7 +5829,6 @@ zfs_freebsd_getpages(ap)
 		vm_page_t *a_m;
 		int a_count;
 		int a_reqpage;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 
@@ -5990,7 +5989,6 @@ zfs_freebsd_putpages(ap)
 		int a_count;
 		int a_sync;
 		int *a_rtvals;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 

Modified: head/sys/fs/fuse/fuse_vnops.c
==============================================================================
--- head/sys/fs/fuse/fuse_vnops.c	Wed Sep 10 12:35:42 2014	(r271386)
+++ head/sys/fs/fuse/fuse_vnops.c	Wed Sep 10 12:36:41 2014	(r271387)
@@ -1721,7 +1721,6 @@ fuse_vnop_write(struct vop_write_args *a
         vm_page_t *a_m;
         int a_count;
         int a_reqpage;
-        vm_ooffset_t a_offset;
     };
 */
 static int

Modified: head/sys/fs/smbfs/smbfs_io.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_io.c	Wed Sep 10 12:35:42 2014	(r271386)
+++ head/sys/fs/smbfs/smbfs_io.c	Wed Sep 10 12:36:41 2014	(r271387)
@@ -419,7 +419,6 @@ smbfs_getpages(ap)
 		vm_page_t *a_m;
 		int a_count;
 		int a_reqpage;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 #ifdef SMBFS_RWGENERIC
@@ -568,7 +567,6 @@ smbfs_putpages(ap)
 		int a_count;
 		int a_sync;
 		int *a_rtvals;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 	int error;

Modified: head/sys/kern/vfs_default.c
==============================================================================
--- head/sys/kern/vfs_default.c	Wed Sep 10 12:35:42 2014	(r271386)
+++ head/sys/kern/vfs_default.c	Wed Sep 10 12:36:41 2014	(r271387)
@@ -721,7 +721,6 @@ vop_stdgetpages(ap)
 		vm_page_t *a_m;
 		int a_count;
 		int a_reqpage;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 
@@ -744,7 +743,6 @@ vop_stdputpages(ap)
 		int a_count;
 		int a_sync;
 		int *a_rtvals;
-		vm_ooffset_t a_offset;
 	} */ *ap;
 {
 

Modified: head/sys/kern/vnode_if.src
==============================================================================
--- head/sys/kern/vnode_if.src	Wed Sep 10 12:35:42 2014	(r271386)
+++ head/sys/kern/vnode_if.src	Wed Sep 10 12:36:41 2014	(r271387)
@@ -473,7 +473,6 @@ vop_getpages {
 	IN vm_page_t *m;
 	IN int count;
 	IN int reqpage;
-	IN vm_ooffset_t offset;
 };
 
 
@@ -485,7 +484,6 @@ vop_putpages {
 	IN int count;
 	IN int sync;
 	IN int *rtvals;
-	IN vm_ooffset_t offset;
 };
 
 

Modified: head/sys/vm/vnode_pager.c
==============================================================================
--- head/sys/vm/vnode_pager.c	Wed Sep 10 12:35:42 2014	(r271386)
+++ head/sys/vm/vnode_pager.c	Wed Sep 10 12:36:41 2014	(r271387)
@@ -657,7 +657,7 @@ vnode_pager_getpages(vm_object_t object,
 
 	vp = object->handle;
 	VM_OBJECT_WUNLOCK(object);
-	rtval = VOP_GETPAGES(vp, m, bytes, reqpage, 0);
+	rtval = VOP_GETPAGES(vp, m, bytes, reqpage);
 	KASSERT(rtval != EOPNOTSUPP,
 	    ("vnode_pager: FS getpages not implemented\n"));
 	VM_OBJECT_WLOCK(object);
@@ -1035,7 +1035,7 @@ vnode_pager_putpages(vm_object_t object,
 	 */
 	vp = object->handle;
 	VM_OBJECT_WUNLOCK(object);
-	rtval = VOP_PUTPAGES(vp, m, bytes, sync, rtvals, 0);
+	rtval = VOP_PUTPAGES(vp, m, bytes, sync, rtvals);
 	KASSERT(rtval != EOPNOTSUPP, 
 	    ("vnode_pager: stale FS putpages\n"));
 	VM_OBJECT_WLOCK(object);