Index: sys/kern/vfs_vnops.c.sav3
===================================================================
--- sys/kern/vfs_vnops.c.sav3
+++ sys/kern/vfs_vnops.c.sav3
@@ -3083,6 +3083,11 @@
 	 * This value is clipped at 4Kbytes and 1Mbyte.
 	 */
 	blksize = MAX(holein, holeout);
+
+	/* Clip len at an exact multiple of hole size. */
+	if (blksize > 0 && blksize < len)
+		len = savlen = len / blksize * blksize;
+
 	if (blksize == 0)
 		blksize = MAX(invp->v_mount->mnt_stat.f_iosize,
 		    outvp->v_mount->mnt_stat.f_iosize);