From df0b0eadc9c233b3b742fc4d048ed5a9bcda3ba0 Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Tue, 5 May 2020 10:41:38 +0200 Subject: [PATCH] kernel/vm: Rename *_putpages()'s 'sync' argument to 'flags'. It used to be a boolean but has now become a general flags argument (for OBJPC_*). --- sys/kern/vfs_default.c | 2 +- sys/kern/vfs_jops.c | 2 +- sys/kern/vfs_vopops.c | 4 ++-- sys/sys/vfsops.h | 8 ++++---- sys/vfs/fuse/fuse_vnops.c | 2 +- sys/vfs/smbfs/smbfs_io.c | 2 +- sys/vm/default_pager.c | 4 ++-- sys/vm/device_pager.c | 2 +- sys/vm/phys_pager.c | 2 +- sys/vm/vnode_pager.c | 8 ++++---- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 6bc6167cb7..a6e4b1c425 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -1253,7 +1253,7 @@ vop_stdputpages(struct vop_putpages_args *ap) if ((mp = ap->a_vp->v_mount) != NULL) { error = vnode_pager_generic_putpages( ap->a_vp, ap->a_m, ap->a_count, - ap->a_sync, ap->a_rtvals); + ap->a_flags, ap->a_rtvals); } else { error = VM_PAGER_BAD; } diff --git a/sys/kern/vfs_jops.c b/sys/kern/vfs_jops.c index b730eddbfb..3878164e1e 100644 --- a/sys/kern/vfs_jops.c +++ b/sys/kern/vfs_jops.c @@ -936,7 +936,7 @@ journal_fsync(struct vop_fsync_args *ap) } /* - * Journal vop_putpages { a_vp, a_m, a_count, a_sync, a_rtvals, a_offset } + * Journal vop_putpages { a_vp, a_m, a_count, a_flags, a_rtvals, a_offset } * * note: a_count is in bytes. */ diff --git a/sys/kern/vfs_vopops.c b/sys/kern/vfs_vopops.c index d3885af976..3bb52951da 100644 --- a/sys/kern/vfs_vopops.c +++ b/sys/kern/vfs_vopops.c @@ -1088,7 +1088,7 @@ vop_getpages(struct vop_ops *ops, struct vnode *vp, vm_page_t *m, int count, */ int vop_putpages(struct vop_ops *ops, struct vnode *vp, vm_page_t *m, int count, - int sync, int *rtvals, vm_ooffset_t offset) + int flags, int *rtvals, vm_ooffset_t offset) { struct vop_putpages_args ap; VFS_MPLOCK_DECLARE; @@ -1099,7 +1099,7 @@ vop_putpages(struct vop_ops *ops, struct vnode *vp, vm_page_t *m, int count, ap.a_vp = vp; ap.a_m = m; ap.a_count = count; - ap.a_sync = sync; + ap.a_flags = flags; ap.a_rtvals = rtvals; ap.a_offset = offset; diff --git a/sys/sys/vfsops.h b/sys/sys/vfsops.h index 548769c2eb..0dcf13ba29 100644 --- a/sys/sys/vfsops.h +++ b/sys/sys/vfsops.h @@ -361,7 +361,7 @@ struct vop_putpages_args { struct vnode *a_vp; struct vm_page **a_m; int a_count; - int a_sync; + int a_flags; int *a_rtvals; vm_ooffset_t a_offset; }; @@ -813,7 +813,7 @@ int vop_reallocblks(struct vop_ops *ops, struct vnode *vp, int vop_getpages(struct vop_ops *ops, struct vnode *vp, struct vm_page **m, int count, int reqpage, vm_ooffset_t offset, int seqaccess); int vop_putpages(struct vop_ops *ops, struct vnode *vp, struct vm_page **m, - int count, int sync, int *rtvals, vm_ooffset_t offset); + int count, int flags, int *rtvals, vm_ooffset_t offset); int vop_freeblks(struct vop_ops *ops, struct vnode *vp, off_t offset, int length); int vop_getacl(struct vop_ops *ops, struct vnode *vp, acl_type_t type, @@ -1060,8 +1060,8 @@ extern struct syslink_desc vop_nrename_desc; vop_reallocblks(*(vp)->v_ops, vp, buflist) #define VOP_GETPAGES(vp, m, count, reqpage, off, seqaccess) \ vop_getpages(*(vp)->v_ops, vp, m, count, reqpage, off, seqaccess) -#define VOP_PUTPAGES(vp, m, count, sync, rtvals, off) \ - vop_putpages(*(vp)->v_ops, vp, m, count, sync, rtvals, off) +#define VOP_PUTPAGES(vp, m, count, flags, rtvals, off) \ + vop_putpages(*(vp)->v_ops, vp, m, count, flags, rtvals, off) #define VOP_FREEBLKS(vp, offset, length) \ vop_freeblks(*(vp)->v_ops, vp, offset, length) #define VOP_GETACL(vp, type, aclp, cred) \ diff --git a/sys/vfs/fuse/fuse_vnops.c b/sys/vfs/fuse/fuse_vnops.c index d6781c948a..eb0b32ed75 100644 --- a/sys/vfs/fuse/fuse_vnops.c +++ b/sys/vfs/fuse/fuse_vnops.c @@ -1591,7 +1591,7 @@ fuse_vop_putpages(struct vop_putpages_args *ap) return VM_PAGER_BAD; return vnode_pager_generic_putpages(ap->a_vp, ap->a_m, ap->a_count, - ap->a_sync, ap->a_rtvals); + ap->a_flags, ap->a_rtvals); } struct vop_ops fuse_vnode_vops = { diff --git a/sys/vfs/smbfs/smbfs_io.c b/sys/vfs/smbfs/smbfs_io.c index a78b470555..32b2bf412a 100644 --- a/sys/vfs/smbfs/smbfs_io.c +++ b/sys/vfs/smbfs/smbfs_io.c @@ -528,7 +528,7 @@ smbfs_getpages(struct vop_getpages_args *ap) * Note that vop_close always invalidate pages before close, so it's * not necessary to open vnode. * - * smbfs_putpages(struct vnode *a_vp, vm_page_t *a_m, int a_count, int a_sync, + * smbfs_putpages(struct vnode *a_vp, vm_page_t *a_m, int a_count, int a_flags, * int *a_rtvals, vm_ooffset_t a_offset) */ int diff --git a/sys/vm/default_pager.c b/sys/vm/default_pager.c index 71e5c5679e..7370814475 100644 --- a/sys/vm/default_pager.c +++ b/sys/vm/default_pager.c @@ -116,9 +116,9 @@ default_pager_getpage(vm_object_t object, vm_page_t *mpp, int seqaccess) */ static void default_pager_putpages(vm_object_t object, vm_page_t *mpp, int count, - int sync, int *rtvals) + int flags, int *rtvals) { - swap_pager_putpages(object, mpp, count, sync, rtvals); + swap_pager_putpages(object, mpp, count, flags, rtvals); } /* diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index ec996f0bc1..b98fd8be27 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -253,7 +253,7 @@ dev_pager_getpage(vm_object_t object, vm_page_t *mpp, int seqaccess) */ static void dev_pager_putpages(vm_object_t object, vm_page_t *m, - int count, int sync, int *rtvals) + int count, int flags, int *rtvals) { panic("dev_pager_putpage called"); } diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c index ab838d321a..93b988355c 100644 --- a/sys/vm/phys_pager.c +++ b/sys/vm/phys_pager.c @@ -107,7 +107,7 @@ phys_pager_getpage(vm_object_t object, vm_page_t *mpp, int seqaccess) */ static void phys_pager_putpages(vm_object_t object, vm_page_t *m, int count, - int sync, int *rtvals) + int flags, int *rtvals) { panic("phys_pager_putpage called"); diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 90c50eae3b..db61c38230 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -630,7 +630,7 @@ vnode_pager_generic_getpages(struct vnode *vp, vm_page_t *mpp, int bytecount, */ static void vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count, - int sync, int *rtvals) + int flags, int *rtvals) { int rtval; struct vnode *vp; @@ -650,17 +650,17 @@ vnode_pager_putpages(vm_object_t object, vm_page_t *m, int count, if ((vmstats.v_free_count + vmstats.v_cache_count) < vmstats.v_pageout_free_min) { - sync |= OBJPC_SYNC; + flags |= OBJPC_SYNC; } /* * Call device-specific putpages function */ vp = object->handle; - rtval = VOP_PUTPAGES(vp, m, bytes, sync, rtvals, 0); + rtval = VOP_PUTPAGES(vp, m, bytes, flags, rtvals, 0); if (rtval == EOPNOTSUPP) { kprintf("vnode_pager: *** WARNING *** stale FS putpages\n"); - rtval = vnode_pager_generic_putpages( vp, m, bytes, sync, rtvals); + rtval = vnode_pager_generic_putpages( vp, m, bytes, flags, rtvals); } } -- 2.11.4.GIT