Page MenuHomeFreeBSD
Files F137991615

D39753.id120830.diff
No OneTemporary
Actions

D39753.id120830.diff
View Options

diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c
--- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c
+++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c
@@ -59,7 +59,7 @@
return (error);
}
-int
+boolean_t
zfs_vfs_held(zfsvfs_t *zfsvfs)
{
return (zfsvfs->z_vfs != NULL);
diff --git a/sys/sys/types.h b/sys/sys/types.h
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -273,7 +273,7 @@
typedef __register_t syscallarg_t;
#ifdef _KERNEL
-typedef int boolean_t;
+typedef unsigned int boolean_t;
typedef struct _device *device_t;
typedef __intfptr_t intfptr_t;
diff --git a/sys/vm/phys_pager.c b/sys/vm/phys_pager.c
--- a/sys/vm/phys_pager.c
+++ b/sys/vm/phys_pager.c
@@ -269,7 +269,7 @@
}
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
--- a/sys/vm/sg_pager.c
+++ b/sys/vm/sg_pager.c
@@ -56,7 +56,7 @@
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 @@
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
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -426,7 +426,7 @@
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
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -129,7 +129,7 @@
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)
{

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 28, 11:02 PM (11 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26307157
Default Alt Text
D39753.id120830.diff (2 KB)

Event Timeline