Index: dist/uts/common/fs/zfs/spa_misc.c
===================================================================
RCS file: /cvsroot/src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_misc.c,v
retrieving revision 1.5
diff -u -r1.5 spa_misc.c
--- dist/uts/common/fs/zfs/spa_misc.c	7 May 2019 08:51:09 -0000	1.5
+++ dist/uts/common/fs/zfs/spa_misc.c	4 Jan 2026 08:55:06 -0000
@@ -458,7 +458,7 @@
  *
  * See also the comments in zfs_space_check_t.
  */
-int spa_slop_shift = 5;
+int spa_slop_shift = 12;
 SYSCTL_INT(_vfs_zfs, OID_AUTO, spa_slop_shift, CTLFLAG_RWTUN,
     &spa_slop_shift, 0,
     "Shift value of reserved space (1/(2^spa_slop_shift)).");
Index: dist/uts/common/fs/zfs/vdev.c
===================================================================
RCS file: /cvsroot/src/external/cddl/osnet/dist/uts/common/fs/zfs/vdev.c,v
retrieving revision 1.7
diff -u -r1.7 vdev.c
--- dist/uts/common/fs/zfs/vdev.c	15 Apr 2024 08:06:36 -0000	1.7
+++ dist/uts/common/fs/zfs/vdev.c	4 Jan 2026 08:55:07 -0000
@@ -1733,6 +1733,7 @@
 	 */
 	vd->vdev_ms_shift = highbit64(vd->vdev_asize / metaslabs_per_vdev);
 	vd->vdev_ms_shift = MAX(vd->vdev_ms_shift, SPA_MAXBLOCKSHIFT);
+	vd->vdev_ms_shift = MIN(vd->vdev_ms_shift, 32);
 }
 
 /*