Restore reading Registry earlier to affect init

Or the tunables for init are missed. Signed-off-by: Jorgen Lundman <[email protected]>
openzfsonwindows · Oct 24, 2024 · f578243 · f578243
1 parent 8f1f2e8
commit f578243
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/module/os/windows/driver.c b/module/os/windows/driver.c
@@ -58,6 +58,7 @@ extern int zfs_kmod_init(void);
 extern void zfs_kmod_fini(void);
 
 extern void sysctl_os_init(PUNICODE_STRING RegistryPath);
+extern void sysctl_os_all(PUNICODE_STRING RegistryPath);
 extern void sysctl_os_fini(void);
 
 
@@ -131,9 +132,11 @@ DriverEntry(_In_ PDRIVER_OBJECT DriverObject,
 	zfs_flags |= 1;
 #endif
 
-	spl_start(pRegistryPath);
-
 	sysctl_os_init(pRegistryPath);
+	// Process Registry once before init.
+	sysctl_os_all(pRegistryPath);
+
+	spl_start(pRegistryPath);
 
 	system_taskq_init();
 

diff --git a/module/os/windows/spl/spl-vmem.c b/module/os/windows/spl/spl-vmem.c
@@ -1555,7 +1555,7 @@ vmem_xalloc(vmem_t *vmp, size_t size, size_t align_arg, size_t phase,
 				vaddr = ((vmem_ximport_t *)
 				    vmp->vm_source_alloc)(vmp->vm_source,
 				    &asize, align, vmflag & VM_KMFLAGS);
-				ASSERT(asize >= oasize);
+
 				ASSERT(P2PHASE(asize,
 				    vmp->vm_source->vm_quantum) == 0);
 				ASSERT(!(vmp->vm_cflags & VMC_XALIGN) ||