git: f74be55e3045 - main - vm: fix a number of functions to match the expected prototypes
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 25 Apr 2023 17:59:14 UTC
The branch main has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=f74be55e3045793a507d98127faf9aabd918e1ce
commit f74be55e3045793a507d98127faf9aabd918e1ce
Author: Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2023-04-25 17:52:26 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2023-04-25 17:58:18 +0000
vm: fix a number of functions to match the expected prototypes
Noticed while attempting to make boolean_t unsigned: some vm-related
function declarations and defintions were using boolean_t where they
should have used int, and vice versa.
MFC after: 1 week
Reviewed by: jhb
Differential Revision: https://reviews.freebsd.org/D39753
---
sys/vm/phys_pager.c | 2 +-
sys/vm/sg_pager.c | 4 ++--
sys/vm/swap_pager.c | 2 +-
sys/vm/vm_pager.c | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
index 6d7c5a4a7291..07ca6f0fc3de 100644
--- a/sys/vm/phys_pager.c
+++ b/sys/vm/phys_pager.c
@@ -269,7 +269,7 @@ phys_pager_populate(vm_object_t object, vm_pindex_t pidx, int fault_type,
}
static void
-phys_pager_putpages(vm_object_t object, vm_page_t *m, int count, boolean_t sync,
+phys_pager_putpages(vm_object_t object, vm_page_t *m, int count, int flags,
int *rtvals)
{
diff --git a/sys/vm/sg_pager.c b/sys/vm/sg_pager.c
index d7af2aed935a..bb2e8f39e219 100644
--- a/sys/vm/sg_pager.c
+++ b/sys/vm/sg_pager.c
@@ -56,7 +56,7 @@ static vm_object_t sg_pager_alloc(void *, vm_ooffset_t, vm_prot_t,
static void sg_pager_dealloc(vm_object_t);
static int sg_pager_getpages(vm_object_t, vm_page_t *, int, int *, int *);
static void sg_pager_putpages(vm_object_t, vm_page_t *, int,
- boolean_t, int *);
+ int, int *);
static boolean_t sg_pager_haspage(vm_object_t, vm_pindex_t, int *,
int *);
@@ -211,7 +211,7 @@ sg_pager_getpages(vm_object_t object, vm_page_t *m, int count, int *rbehind,
static void
sg_pager_putpages(vm_object_t object, vm_page_t *m, int count,
- boolean_t sync, int *rtvals)
+ int flags, int *rtvals)
{
panic("sg_pager_putpage called");
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index 6e423ae107a8..38816b364c67 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -426,7 +426,7 @@ static int swap_pager_getpages(vm_object_t, vm_page_t *, int, int *,
int *);
static int swap_pager_getpages_async(vm_object_t, vm_page_t *, int, int *,
int *, pgo_getpages_iodone_t, void *);
-static void swap_pager_putpages(vm_object_t, vm_page_t *, int, boolean_t, int *);
+static void swap_pager_putpages(vm_object_t, vm_page_t *, int, int, int *);
static boolean_t
swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, int *after);
static void swap_pager_init(void);
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index e24348ed39a0..2a3f136b4bac 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -129,7 +129,7 @@ dead_pager_putpages(vm_object_t object, vm_page_t *m, int count,
rtvals[i] = VM_PAGER_AGAIN;
}
-static int
+static boolean_t
dead_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *prev, int *next)
{